Changeset 12549 for trunk/gsdl

Timestamp:

2006-08-25T10:02:55+12:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed up the creation of the _homeextra_ table so it is HTML 4 compliant.

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -228 +228 @@
                  ostream &logout) {
   
-  text_t homeextra = "<table class=\"collections\"><tr valign=\"top\">\n";
+  text_t homeextra = "<table class=\"collections\">\n";
   bool found_valid_col = false;
   recptprotolistclass::iterator rprotolist_here = protos->begin();
@@ -243 +243 @@
 
     int count = 0;
-    bool first = true;
     while (collist_here != collist_end) {
       ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
@@ -288 +287 @@
           }
           
-          if ((count%configinfo.HomePageCols == 0) && (!first))
-        homeextra += "</tr><tr valign=\"top\">\n";
+          if (count%configinfo.HomePageCols == 0)
+        homeextra += "<tr valign=\"top\">\n";
           
           comerror_t err;
@@ -305 +304 @@
           
           ++count;
-          first = false;
+          if (count%configinfo.HomePageCols == 0)
+        homeextra += "</tr>\n";
         }
       }
@@ -311 +311 @@
     }
 
-    for (; count%configinfo.HomePageCols != 0; ++count) homeextra += "<td></td>\n";
-      }
-    }
-    homeextra += "</tr>\n<tr>\n";
+    // Finish off the last row, if necessary
+    if (count%configinfo.HomePageCols != 0) {
+      while (count%configinfo.HomePageCols != 0) {
+        homeextra += "<td></td>\n";
+        ++count;
+      }
+      homeextra += "</tr>\n";
+    }
+      }
+    }
     ++rprotolist_here;
   }
 
   if (!found_valid_col) {
-    homeextra += "<td>No valid (i.e. built and public) collections are available</td>\n";
-  }
-  homeextra += "</tr></table>\n";
+    homeextra += "<tr><td>No valid (i.e. built and public) collections are available</td></tr>\n";
+  }
+  homeextra += "</table>\n";
   disp.setmacro ("homeextra", "home", homeextra); 
 }