Changeset 2407 for trunk/gsdl/src

Timestamp:

2001-05-14T12:34:09+12:00 (23 years ago)

Author:

sjboddie

Message:

further changes to collector interface

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (9 diffs)
• collectoraction.h (modified) (1 diff)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -198 +198 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  arg_ainfo.shortname = "bc1filenum";
+  arg_ainfo.shortname = "bc1inputnum";
   arg_ainfo.longname = "collector specific";
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "1";
+  arg_ainfo.argdefault = "3";
   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  arg_ainfo.shortname = "bc1httpnum";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "1";
-  arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1ftpnum";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "1";
-  arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1fileinput";
+  arg_ainfo.shortname = "bc1input";
   arg_ainfo.longname = "collector specific";
   arg_ainfo.multiplechar = true;
@@ -231 +215 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  arg_ainfo.shortname = "bc1httpinput";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.multiplevalue = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1ftpinput";
+  arg_ainfo.shortname = "bc1inputtype";
   arg_ainfo.longname = "collector specific";
   arg_ainfo.multiplechar = true;
@@ -358 +333 @@
     saved_args["bc1clone"] = "";
     saved_args["bc1clonecol"] = "";
-    saved_args["bc1filenum"] = "";
-    saved_args["bc1httpnum"] = "";
-    saved_args["bc1ftpnum"] = "";
-    saved_args["bc1fileinput"] = "";
-    saved_args["bc1httpinput"] = "";
-    saved_args["bc1ftpinput"] = "";
+    saved_args["bc1inputnum"] = "";
+    saved_args["bc1input"] = "";
+    saved_args["bc1inputtype"] = "";
 
     // update the argdb database with any arguments that were set
@@ -864 +836 @@
 }
 
-// set _filelist_, _httplist_, _ftplist_ and _badsources_ macros
+// set _sourcelist_ and _badsources_ macros
 void collectoraction::set_inputsourceboxes (displayclass &disp, cgiargsclass &args, 
                         ostream &logout) {
@@ -870 +842 @@
   if (badsources) disp.setmacro ("badsources", "collector", "1");
 
-  int numfileboxes = args["bc1filenum"].getint();
-  int numhttpboxes = args["bc1httpnum"].getint();
-  int numftpboxes = args["bc1ftpnum"].getint();
-
-  text_t filelist = get_source_box(args["bc1fileinput"], numfileboxes, "file");
-  text_t httplist = get_source_box(args["bc1httpinput"], numhttpboxes, "http");
-  text_t ftplist = get_source_box(args["bc1ftpinput"], numftpboxes, "ftp");
-
-  disp.setmacro("filelist", "collector", dm_safe(filelist));
-  disp.setmacro("httplist", "collector", dm_safe(httplist));
-  disp.setmacro("ftplist", "collector", dm_safe(ftplist));
+  text_t sourcelist = get_source_box(args["bc1input"], args["bc1inputnum"].getint(),
+                     args["bc1inputtype"]);
+
+  disp.setmacro("sourcelist", "collector", sourcelist);
 
   // reset badsources and failedsources variables
@@ -887 +852 @@
 }
 
-text_t collectoraction::get_source_box (text_t inputarg, int numboxes, text_t boxtype) {
-
-  text_tarray files;
-  // this relies on filenames/URLs/ftp addresses not being able to contain
+text_t collectoraction::get_source_box (text_t inputarglist, int numboxes,
+                    text_t inputtypelist) {
+
+  text_tarray inputvalues;
+  // this relies on filenames/URLs not being able to contain
   // commas
-  splitchar (inputarg.begin(), inputarg.end(), ',', files);
-
-  text_t rv = "<table border=0>\n";
+  splitchar (inputarglist.begin(), inputarglist.end(), ',', inputvalues);
+  // remove any empty values from the end of the array
+  if (inputvalues.size()) {
+    text_tarray::iterator l = inputvalues.end() - 1;
+    text_tarray::iterator b = inputvalues.begin();
+    while ((*l).empty() && l >= b) {
+      l--;
+    }
+    inputvalues.erase(l+1, inputvalues.end());
+  }
+
+  text_tarray inputtypes;
+  splitchar (inputtypelist.begin(), inputtypelist.end(), ',', inputtypes);
+
+  int numvalues = inputvalues.size();
+  int numtypes = inputtypes.size();
+
+  text_t last = "file://";
+  text_t rv;
   for (int i = 0; i < numboxes; i++) {
-    rv += "<tr><td><input type=text name=\"bc1" + boxtype + "input\" value=\"";
-    if (i < files.size()) {
-      rv += files[i];
-    }
-    rv += "\" size=50></td>";
+    rv += "<nobr><select name=\"bc1inputtype\">\n";
+    rv += "<option value=\"file://\"";
+    if ((i < numtypes && inputtypes[i] == "file://") ||
+    (numboxes == 3 && i == 0 && numvalues == 0) ||
+    (i >= 3 && i >= numvalues && last == "file://")) {
+      rv += " selected";
+      last = "file://";
+    }
+    rv += ">file://\n";
+    rv += "<option value=\"http://\"";
+    if ((i < numtypes && inputtypes[i] == "http://") ||
+    (numboxes == 3 && i == 1 && numvalues == 0) ||
+    (i >= 3 && i >= numvalues && last == "http://")) {
+      rv += " selected";
+      last = "http://";
+    }
+    rv += ">http://\n";
+    rv += "<option value=\"ftp://\"";
+    if ((i < numtypes && inputtypes[i] == "ftp://") ||
+    (numboxes == 3 && i == 2 && numvalues == 0) ||
+    (i >= 3 && i >= numvalues && last == "ftp://")) {
+      rv += " selected";
+      last = "ftp://";
+    }
+    rv += ">ftp://\n";
+    rv += "</select>\n";
+    rv += "<input type=text name=\"bc1input\" value=\"";
+    if (i < numvalues) {
+      rv += dm_safe(inputvalues[i]);
+    }
+    rv += "\" size=50>";
     if (badsources) {
-      if ((i < files.size()) && (!files[i].empty())) {
-    if (failedsources[files[i]] == "1") {
-      rv += "<td width=40>no</td>";
+      if ((i < numvalues) && (!inputvalues[i].empty())) {
+    if (failedsources[inputvalues[i]] == "1") {
+      rv += "_iconcross_";
     } else {
-      rv += "<td width=40>yes</td>";
+      rv += "_icontick_";
     }
       } else {
-    rv += "<td width=40></td>";
+    rv += "_iconblank_";
       }
     }
     if (i+1 == numboxes) {
-      rv += "<td><a href=\"javascript:more('" + boxtype + "')\">more</a></td></tr>\n";
+      rv += "_imagemore_</nobr>";
     } else {
-      rv += "<td></td></tr>\n";
-    }
-  }
-  rv += "</table>\n";
+      rv += "</nobr>\n";
+    }
+  }
   
   return rv;
@@ -1005 +1012 @@
   // _gsdlhome_ - the gsdlhome path (dm_safe)
 
-  // _filelist_ -- these three display "input source" text boxes
-  // _httplist_ -- for the "source data" page 
-  // _ftplist_  --
-
+  // _sourcelist_ -- "input source" text boxes
   // _badsources_ -- will be set to "1" if we've come from the 
   //                 "source data" page and there's a problem 
@@ -1636 +1640 @@
   }
 
-  text_tarray files;
-  text_t filevals = args["bc1fileinput"];
-  // this relies on filenames not being able to contain commas
-  splitchar (filevals.begin(), filevals.end(), ',', files);
-  text_tarray::const_iterator here = files.begin();
-  text_tarray::const_iterator end = files.end();
-  while (here != end) {
-    options += " -download \"" + *here + "\"";
-    here ++;
-  }
-  text_tarray https;
-  text_t httpvals = args["bc1httpinput"];
-  // this relies on URLs not being able to contain commas
-  splitchar (httpvals.begin(), httpvals.end(), ',', https);
-  here = https.begin();
-  end = https.end();
-  while (here != end) {
-    options += " -download \"" + *here + "\"";
-    here ++;
-  }
-  text_tarray ftps;
-  text_t ftpvals = args["bc1ftpinput"];
-  // this relies on ftp addresses not being able to contain commas
-  splitchar (ftpvals.begin(), ftpvals.end(), ',', ftps);
-  here = ftps.begin();
-  end = ftps.end();
-  while (here != end) {
-    options += " -download \"" + *here + "\"";
-    here ++;
+  text_tarray inputvalues, inputtypes;
+  // this relies on filenames/URLs not being able to contain commas
+  splitchar (args["bc1input"].begin(), args["bc1input"].end(), ',', inputvalues);
+  splitchar (args["bc1inputtype"].begin(), args["bc1inputtype"].end(), ',', inputtypes);
+  int numvalues = inputvalues.size();
+  int numtypes = inputtypes.size();
+  for (int i = 0; i < numvalues; i++) {
+    if (!inputvalues[i].empty()) {
+      text_t type = "file://"; // default
+      if (i < numtypes) type = inputtypes[i];
+      options += " -download \"" + type + format_url(inputvalues[i]) + "\"";
+    }
   }
 
@@ -1863 +1850 @@
   bool found = false;
 
-  // check local filesystem for file:// sources
-  text_tarray files;
-  text_t filevals = args["bc1fileinput"];
-  // this relies on filenames not being able to contain commas
-  splitchar (filevals.begin(), filevals.end(), ',', files);
-  text_tarray::const_iterator here = files.begin();
-  text_tarray::const_iterator end = files.end();
-  while (here != end) {
-    text_t file = format_url(*here);
-    if (!file_exists(file) && !directory_exists(file)) {
-      failedsources[*here] = "1";
-      badsources = true;
-    }
-    found = true;
-    here ++;
-  }
-
-  // ping http:// sources
-  files.erase(files.begin(), files.end());
-  text_t httpvals = args["bc1httpinput"];
-  // this relies on URLs not being able to contain commas
-  splitchar (httpvals.begin(), httpvals.end(), ',', files);
-  here = files.begin();
-  end = files.end();
-  while (here != end) {
-    if (gsdl_system ("perl -S ping.pl -quiet http://" + format_url(*here), true, logout)) {
-      failedsources[*here] = "1";
-      badsources = true;
-    }
-    found = true;
-    here++;
-  }
-
-  // ping ftp:// sources
-  files.erase(files.begin(), files.end());
-  text_t ftpvals = args["bc1ftpinput"];
-  // this relies on FTP addresses not being able to contain commas
-  splitchar (ftpvals.begin(), ftpvals.end(), ',', files);
-  here = files.begin();
-  end = files.end();
-  while (here != end) {
-    if (gsdl_system ("perl -S ping.pl -quiet ftp://" + format_url(*here), true, logout)) {
-      failedsources[*here] = "1";
-      badsources = true;
-    }
-    found = true;
-    here++;
+  text_tarray inputvalues;
+  // this relies on filenames/URLs not being able to contain
+  // commas
+  splitchar (args["bc1input"].begin(), args["bc1input"].end(), ',', inputvalues);
+
+  text_tarray inputtypes;
+  splitchar (args["bc1inputtype"].begin(), args["bc1inputtype"].end(), ',', inputtypes);
+
+  int numvalues = inputvalues.size();
+  int numtypes = inputtypes.size();
+
+  for (int i = 0; i < numvalues; i++) {
+    text_t value = format_url(inputvalues[i]);
+    text_t type = "file://"; // default
+    if (!value.empty()) {
+      found = true;
+      if (i >= numtypes || inputtypes[i].empty()) {
+    logout << "collectoraction::check_sources: WARNING type not set\n";
+      } else {
+    type = inputtypes[i];
+      }
+      if (type == "file://") {
+    if (!file_exists(value) && !directory_exists(value)) {
+      failedsources[inputvalues[i]] = "1";
+      badsources = true;
+    }
+      } else if (type == "http://") {
+    if (gsdl_system ("perl -S ping.pl -quiet http://" + value, true, logout)) {
+      failedsources[inputvalues[i]] = "1";
+      badsources = true;
+    }
+      } else if (type == "ftp://") {
+    if (gsdl_system ("perl -S ping.pl -quiet ftp://" + value, true, logout)) {
+      failedsources[inputvalues[i]] = "1";
+      badsources = true;
+    }
+      }
+    }
   }
 

trunk/gsdl/src/recpt/collectoraction.h

@@ -57 +57 @@
                  ostream &logout);
 
-  text_t get_source_box (text_t inputarg, int numboxes, text_t boxtype);
+  text_t get_source_box (text_t inputarglist, int numboxes, 
+             text_t inputtypelist);
 
   void set_cfgfile (displayclass &disp, cgiargsclass &args, ostream &logout);