Changeset 10947

Timestamp:

2005-11-25T13:12:03+13:00 (18 years ago)

Author:

jrm21

Message:

If we aren't using tables (ie format string doesn't start with <td>)
then wrap the h/v list with <div> ... </div>.
Also add class=v_list | h_list respectively to opening <table>/<div> tags.

Location:

trunk/gsdl/src/recpt

Files:

• hlistbrowserclass.cpp (modified) (5 diffs)
• vlistbrowserclass.cpp (modified) (8 diffs)

trunk/gsdl/src/recpt/hlistbrowserclass.cpp

@@ -102 +102 @@
         collectproto, response, logout);
 
-                    
+  /* use_table is set to true if the format string starts with <td> */
   if (use_table || colnumber > 0) {
     textout << outconvert << "<table><tr><td>";
@@ -115 +115 @@
   }
 
-  textout << outconvert << "<table><tr>\n";
+  if (use_table)
+    textout << outconvert << "<table class=\"h_list\"><tr>\n";
+  else
+    textout << outconvert << "<div class=\"h_list\">\n";
 
   ResultDocInfo_tarray::iterator tsibling = response.docInfo.begin();
@@ -121 +124 @@
 
   text_t icon, link;
-  int num_chars=0; // see note below - jrm21
+
   while (tsibling != esibling) {
 
@@ -139 +142 @@
     if (args["xx"]=="1") {
       // documents should be detached
-      link += "&amp;x=1\" target=\\_blank>";
+      link += "&amp;x=1\" target=\"_blank\">";
     } else {
       link += "\">";
@@ -156 +159 @@
                       options, logout);
 
-    /* this is awful. Someone please come up with a better way to prevent
-       the table of contents when browsing metadata from becoming too wide.
-       This is an attempt to add new rows when the number of characters in
-       the current row becomes too high. It doesn't know about macros in the
-       string, though... -- jrm21 */
-
-    char *tmp_str=fmt_str.getcstr();
-    char *end_str=tmp_str+strlen(tmp_str);
-    while (tmp_str<end_str) {
-      if (*tmp_str=='<') {    // for html tags
-    while (*tmp_str!='>') ++tmp_str; 
-      } else if (*tmp_str=='&') { // for html entities
-    while (*tmp_str!=';') ++tmp_str; 
-    ++num_chars;
-      } else ++num_chars;
-      ++tmp_str;
-    }
-
-    if (num_chars>100) { // this is fairly arbitrary...
-      textout << outconvert << "</tr>\n<tr>";
-      num_chars=0;
-    }
-
-    textout << outconvert << "<td>" << disp << fmt_str << "</td>\n";
+    textout << outconvert << "<span class=\"h_item\">" << disp << fmt_str << "</span>\n";
     ++tsibling;
   }
 
-  textout << outconvert << "</tr></table>\n";
+  if (use_table)
+    textout << outconvert << "</tr></table>\n";
+  else
+    textout << outconvert << "</div>\n";
+
   if (use_table  || colnumber > 0) textout << outconvert << "</tr></table>\n";
+
   return 0;
 }

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -57 +57 @@
 
 text_t vlistbrowserclass::get_default_formatstring () {
-  return "<td valign=top>[link][icon][/link]</td>"
-    "<td valign=top>[srclink][srcicon][/srclink]</td>"
-    "<td valign=top>[highlight]{Or}{[Title],Untitled}[/highlight]"
+  return "<td valign=\"top\">[link][icon][/link]</td>"
+    "<td valign=\"top\">[srclink][srcicon][/srclink]</td>"
+    "<td valign=\"top\">[highlight]{Or}{[Title],Untitled}[/highlight]"
     "{If}{[Source],<br><i>([Source])</i>}</td>";
 }
@@ -84 +84 @@
 
 
+  /* use_table is set to true if the format string starts with <td> */
   if (use_table || colnumber > 0) {
-    textout << outconvert << "<table><tr valign=top>";
+    textout << outconvert << "<table class=\"v_list\"><tr valign=\"top\">";
     // get tab size
     text_t tab; int itab;
@@ -93 +94 @@
                    << "<td><img src=\"_httpimg_/space.gif\" width=" 
                    << (itab*colnumber) << "></td>";
+  } else {
+    textout << outconvert << "<div class=\"v_list\">\n";
   }
 
@@ -106 +109 @@
                    options, logout);
   
-  if (use_table  || colnumber > 0) textout << outconvert << "</tr></table>\n";
+  if (use_table  || colnumber > 0) {
+    textout << outconvert << "</tr></table>\n";
+  } else {
+    textout << outconvert << "</div>\n";
+  }
 
   return 1;
@@ -127 +134 @@
 
   if (colnumber > 0) {
-    textout << outconvert << "<table><tr valign=top>";
+    textout << outconvert << "<table><tr valign=\"top\">";
     // get tab size
     text_t tab; int itab;
@@ -137 +144 @@
     textout << outconvert << "<td>";
   }
-  if (use_table) textout << outconvert << "<table>\n";
+
+  /* use table set to true if format string starts with <td> */
+  if (use_table) {
+    textout << outconvert << "<table class=\"v_list\">\n";
+  } else {
+    textout << outconvert << "<div class=\"v_list\">\n";
+  }
 
   ResultDocInfo_tarray::iterator thissection = sections.docInfo.begin();
@@ -143 +156 @@
 
   // ** here lies Alan's hack to get 4 results per table row
-  int item = 0, perline;; // set perline to 1 normally
+  int item = 0, perline; // set perline to 1 normally
   text_t fstring;
 
@@ -194 +207 @@
   }
 
-  if (use_table) textout << outconvert << "</table>\n";
+  if (use_table)
+    textout << outconvert << "</table>\n";
+  else
+    textout << outconvert << "</div>\n";
   if (colnumber > 0) textout << outconvert << "</td></tr></table>\n";