Changeset 1172

Timestamp:

2000-05-12T17:09:28+12:00 (24 years ago)

Author:

sjboddie

Message:

more changes to try to get end-user collection building to work
under windows

File:

• trunk/gsdl/src/recpt/buildaction.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/buildaction.cpp

@@ -115 +115 @@
   text_t fullnamelist = "var fullnamelist = new Array(";
   text_t dirnamelist  = "var dirnamelist = new Array(";
-  text_t fullnamemenu = (text_t)"<input type=hidden name=\"bc1fullnameindex\""
-                        +" value=\"_bcargfullnameindex_\">\n"
-                        +"<select name=\"bc1fullnamemenu\" onChange=fullnameindex_changed()>\n";
+  text_t fullnamemenu = "<input type=hidden name=\"bc1fullnameindex\"";
+  fullnamemenu += " value=\"_bcargfullnameindex_\">\n";
+  fullnamemenu += "<select name=\"bc1fullnamemenu\" onChange=fullnameindex_changed()>\n";
   int rcount = 1;
   int fcount = 1;
@@ -168 +168 @@
         dirnamelist += (text_t)"\"" + *collist_here + "\"";
 
-        fullnamemenu += (text_t)"<option value=\"" + collectionname + "\"";
-        if (args["bc1dirname"] == "")
+        fullnamemenu += "<option value=\"" + collectionname;
+        fullnamemenu.push_back ('"');
+        if (args["bc1dirname"].empty())
           {
         if ((rcount==1) && (ccount==1)) 
@@ -201 +202 @@
         if (args["bca"]=="buildcol")
           {
-        if (((args["bc1dirname"]=="") && (rcount==1) && (ccount==1))
+        if (((args["bc1dirname"].empty()) && (rcount==1) && (ccount==1))
             || (args["bc1dirname"]==*collist_here))
           {
@@ -239 +240 @@
     }
 
-  if ((args["bca"]=="delcol") || (args["bca"]=="editcol") || (args["bca"]=="buildcol") || (args["bca"]=="collog"))
+  if ((args["bca"]=="delcol") || (args["bca"]=="editcol") || 
+      (args["bca"]=="buildcol") || (args["bca"]=="collog"))
     {
       disp.setmacro ("dirnamelist", "build", dirnamelist);
@@ -267 +269 @@
     text_t bc1name = substr(args_entry.begin()+3,args_entry.end());
     text_t cached_cgiarg = "bcarg" + bc1name;
-    disp.setmacro(cached_cgiarg,"build",args[args_entry]);
+    disp.setmacro(cached_cgiarg, "build", args[args_entry]);
       }
     args_here++;
@@ -474 +476 @@
       textout << outconvert << disp << headmess << content << "_build:framefooter_\n";
       text_t cmd = filename_cat(gsdlhome, "cgi-bin", "webpage_buildcol.pl");
-      cmd += " gsdlhome=\""+gsdlhome+"\" httpbuild=\""+args["httpbuild"]+"\"";
+      cmd += " httpbuild=\""+args["httpbuild"]+"\"";
       cmd += " bc1copydata=\""+args["bc1copydata"]+"\"";
       cmd += " bc1doimport=\""+args["bc1doimport"]+"\"";
@@ -480 +482 @@
       cmd += " bc1dirname=\""+args["bc1dirname"]+"\" bc1tmpname=\""+tmpname+"\" &";
       
-      system(cmd.getcstr());
+      char *cstr_cmd = cmd.getcstr();
+      system(cstr_cmd);
+      delete cstr_cmd;
     }