From b839e9edc77dde4c40f2a8479e1b42223852daee Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Apr 2015 18:17:00 +0100
Subject: archive query methods: Clarify organisation (code motion, nfc)

---
 dgit | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 088c5a2..2e67eb5 100755
--- a/dgit
+++ b/dgit
@@ -773,6 +773,25 @@ sub must_getcwd () {
     return $d;
 }
 
+our %rmad;
+
+sub archive_query ($) {
+    my ($method) = @_;
+    my $query = access_cfg('archive-query','RETURN-UNDEF');
+    $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
+    my $proto = $1;
+    my $data = $'; #';
+    { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
+}
+
+sub pool_dsc_subpath ($$) {
+    my ($vsn,$component) = @_; # $package is implict arg
+    my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
+    return "/pool/$component/$prefix/$package/".dscfn($vsn);
+}
+
+#---------- `ftpmaster-api' archive query method (nascent) ----------
+
 sub archive_api_query_cmd ($) {
     my ($subpath) = @_;
     my @cmd = qw(curl -sS);
@@ -794,22 +813,7 @@ sub archive_api_query_cmd ($) {
     return @cmd;
 }
 
-our %rmad;
-
-sub archive_query ($) {
-    my ($method) = @_;
-    my $query = access_cfg('archive-query','RETURN-UNDEF');
-    $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
-    my $proto = $1;
-    my $data = $'; #';
-    { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
-}
-
-sub pool_dsc_subpath ($$) {
-    my ($vsn,$component) = @_; # $package is implict arg
-    my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
-    return "/pool/$component/$prefix/$package/".dscfn($vsn);
-}
+#---------- `madison' archive query method ----------
 
 sub archive_query_madison {
     return map { [ @$_[0..1] ] } madison_get_parse(@_);
@@ -857,6 +861,8 @@ sub canonicalise_suite_madison {
     return $r[0][2];
 }
 
+#---------- `sshpsql' archive query method ----------
+
 sub sshpsql ($$$) {
     my ($data,$runeinfo,$sql) = @_;
     if (!length $data) {
@@ -930,6 +936,8 @@ END
     return $rows[0];
 }
 
+#---------- `dummycat' archive query method ----------
+
 sub canonicalise_suite_dummycat ($$) {
     my ($proto,$data) = @_;
     my $dpath = "$data/suite.$isuite";
@@ -969,6 +977,8 @@ sub archive_query_dummycat ($$) {
     return sort { -version_compare($a->[0],$b->[0]); } @rows;
 }
 
+#---------- archive query entrypoints and rest of program ----------
+
 sub canonicalise_suite () {
     return if defined $csuite;
     fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
-- 
cgit v1.2.3