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

Timestamp:

2008-02-22T11:25:40+13:00 (15 years ago)

Author:

davidb

Message:

Collections can now be put in to "groups" i.e. can be located inside another collection, which is marked as "collectgroup" true. The top-level collection appears on the home page, and when clicked upon display a new "home page" with only the collections appearing within its folder displayed. To implement this, the main change is in collectset.cpp, which now runs "add_all_collection_groups" after it has added all the top-level collections. comtypes.h has been updated to include the new field, "isCollectGroup". Finally, pageaction.cpp has been updated so these changes are reflected in the home page generated.

File:

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

gsdl/trunk/src/recpt/pageaction.cpp

@@ -180 +180 @@
     bool first = true;
     while (collist_here != collist_end) {
+
       ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
       
@@ -253 +254 @@
     int count = 0;
     while (collist_here != collist_end) {
+
       ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
+
+      text_t arg_g = args["g"];
+      text_t colname_dir = *collist_here;
       
+      if (arg_g.empty()) {
+        // normal top-level home page
+        text_t::const_iterator begin = colname_dir.begin();
+        text_t::const_iterator end = colname_dir.end();
+
+        if (findchar(begin,end,'/')!=end) {
+          // no g argument, so generating top level home page
+          // => if colname_dir has "/" in collection name, filter it out
+
+          ++collist_here;
+          continue;
+        }
+      }
+      else {
+        // show only collections in the named group
+
+        
+        if (colname_dir == arg_g) {
+          // display about this collect text
+
+          text_t collectionextra = cinfo->get_collectionmeta("collectionextra", args["l"]);
+          if (!collectionextra.empty()) {
+        // prepend text on at start
+        homeextra = "<p>" + collectionextra + "</p>" + homeextra;
+          }
+
+          ++collist_here;
+          continue;
+        }
+
+
+        // => filter out anything that does not start with the group prefix
+        
+        if (!starts_with(colname_dir,arg_g + "/")) {
+          ++collist_here;
+          continue;
+        }
+      }
+
+
       if (cinfo != NULL) {
-        if (cinfo->isPublic && (cinfo->buildDate > 0)) {
+        if (cinfo->isPublic && ((cinfo->buildDate > 0)) || (cinfo->isCollectGroup)) {
 
           found_valid_col = true;
@@ -264 +309 @@
         alt = collectionname;
           }
+
+
+          comerror_t err;
+          text_t optsite = g_EmptyText;
+          text_t site_name = (*rprotolist_here).p->get_site_name (err);
+          if (!site_name.empty()) { optsite = "site="+site_name+"&amp;"; }
+
+          text_t link;
+
+          if (cinfo->isCollectGroup) {
+        link = "<a class=\"collectiontitle\" href=\"_gwcgi_?"+optsite+"a=p&amp;p=home&amp;g=" + *collist_here;
+        link += "&amp;l=" + args["l"] + "&amp;w=" + args["w"] + "\">";
+          }
+          else {
+        link = "<a class=\"collectiontitle\"href=\"_gwcgi_?"+optsite+"a=p&amp;p=about&amp;c=" + *collist_here;
+        link += "&amp;l=" + args["l"] + "&amp;w=" + args["w"] + "\">";
+          }
+          
+          if (!cinfo->receptionist.empty()) 
+        link = "<a class=\"collectiontitle\"href=\"" + cinfo->receptionist + "\">";
+          
           
           // url to image: try iconcollectionsmall, then iconcollection
@@ -291 +357 @@
         
         collectionname 
-          = "<img width=\"150\" src=\"" + iconurl + "\" alt=\"" + alt + "\">";
-          } else {
-        collectionname = alt;
+          = link + "<img width=\"150\" src=\"" + iconurl + "\" alt=\"" + alt + "\">" + "</a>";
+          } else {      
+
+        collectionname = "<div class=\"collecttitle\" style=\"width: 150px; border: 1px solid; \"><p class=\"collectiontitle\" style=\"font-size: 18px; width: 150px; white-space:normal; \">";
+        collectionname += alt + "</p></div>";
+
+        collectionname = link + collectionname + "</a>";
+
           }
           
           if (count%configinfo.HomePageCols == 0)
-        homeextra += "<tr valign=\"top\">\n";
-          
-          comerror_t err;
-          text_t optsite = g_EmptyText;
-          text_t site_name = (*rprotolist_here).p->get_site_name (err);
-          if (!site_name.empty()) { optsite = "site="+site_name+"&amp;"; }
-
-          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&amp;p=about&amp;c=" + *collist_here;
-          link += "&amp;l=" + args["l"] + "&amp;w=" + args["w"] + "\">";
-          
-          if (!cinfo->receptionist.empty()) 
-        link = "<a href=\"" + cinfo->receptionist + "\">";
-          
-          homeextra += "<td>" + link + collectionname + "</a></td>\n";
+        homeextra += "<tr valign=\"top\">\n";         
+
+          homeextra += "<td align=\"center\">" + collectionname + "</td>\n";
           
           ++count;