Changeset 905 for trunk/gsdl/src/recpt/pageaction.cpp

Timestamp:

2000-02-03T14:49:35+13:00 (24 years ago)

Author:

sjboddie

Message:

fixed up some of the preferences stuff

File:

• trunk/gsdl/src/recpt/pageaction.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.26  2000/02/03 01:49:35  sjboddie
+   fixed up some of the preferences stuff
+
    Revision 1.25  2000/01/26 20:11:04  sjboddie
    added some collection specific help text
@@ -325 +328 @@
       text_tarray::const_iterator col_here = cinfo.ccsCols.begin();
       text_tarray::const_iterator col_end = cinfo.ccsCols.end();
+      int count = 0;
       while (col_here != col_end) {
     text_t colname;
@@ -332 +336 @@
       ColInfoResponse_t this_cinfo;
       collectproto->get_collectinfo (*col_here, this_cinfo, err, logout);
+      if (err != noError) {col_here ++; continue;}
       colname = this_cinfo.collectionmeta["collectionname"];
     }
 
+    count ++;
     collectionoption += "<input type=checkbox name=\"cc\" value=\"" + 
       *col_here + "\" onClick=\"updatecc(\'" + *col_here + "\');\"> " +
@@ -340 +346 @@
     col_here ++;
       }
-
-      disp.setmacro ("collectionoption", "preferences", collectionoption);
+      
+      if (count > 1)
+    disp.setmacro ("collectionoption", "preferences", collectionoption);
     }
 
@@ -472 +479 @@
     text_tarray::const_iterator end = cinfo.ccsCols.end();
     bool first = true;
+    int count = 0;
     while (here != end) {
       if (*here == arg_c) {
@@ -479 +487 @@
         ColInfoResponse_t this_cinfo;
         collectproto->get_collectinfo (*here, this_cinfo, err, logout);
-        if (err == noError) {
-          if (!first) textsubcollections += "<br>";
-          textsubcollections += "\n" + this_cinfo.collectionmeta["collectionname"] + "\n";
-        }
+        if (err != noError) {here ++; continue;}
+        if (!first) textsubcollections += "<br>";
+        textsubcollections += "\n" + this_cinfo.collectionmeta["collectionname"] + "\n";
       }
+      count ++;
       first = false;
       here ++;
     }
     textsubcollections += "_textsubcols2_";
-    disp.setmacro ("textsubcollections", "about", textsubcollections);
+    if (count > 1) 
+      disp.setmacro ("textsubcollections", "about", textsubcollections);
       }
     }