Changeset 9401 for trunk/gsdl

Timestamp:

2005-03-14T09:49:40+13:00 (19 years ago)

Author:

davidb

Message:

formattoools.cpp extended to supoorts 'child' request, within [Metadata]
in addition to existing 'partent' and 'sibling' requests.

Location:

trunk/gsdl/src/recpt

Files:

• formattools.cpp (modified) (14 diffs)
• formattools.h (modified) (2 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -45 +45 @@
                   text_tmap &options, ostream& logout);
 
+static text_t expand_metadata(const text_t &metavalue, const text_t& collection,
+                  recptproto* collectproto, ResultDocInfo_t &docinfo,
+                  displayclass &disp, text_tmap &options,
+                  ostream &logout);
+
 
 void metadata_t::clear() {
   metaname.clear();
   metacommand = mNone;
-  parentcommand = pNone;
+  mqualifier.parent  = pNone;
+  mqualifier.sibling = sNone;
+  mqualifier.child   = cNone;
   functionoptions.clear();
 }
@@ -490 +497 @@
     here ++;
   }
+
   instring = meta;
   if (com.empty())
-    metaoption.parentcommand = pImmediate;
+    metaoption.mqualifier.parent = pImmediate;
   else if (com == "Top")
-    metaoption.parentcommand = pTop;
+    metaoption.mqualifier.parent = pTop;
   else if (com == "All") {
-    metaoption.parentcommand = pAll;
+    metaoption.mqualifier.parent = pAll;
     metaoption.functionoptions = op;
   }
@@ -528 +536 @@
 
   if (com.empty()) {
+    metaoption.mqualifier.sibling = sAll;
     metaoption.functionoptions = " ";
   }
   else {
+    metaoption.mqualifier.sibling = sAll;
     metaoption.functionoptions = op;
   }
 }
+
+static void get_child_options (text_t &instring, metadata_t &metaoption) {
+
+  assert (instring.size() > 6);
+  if (instring.size() <= 6) return;
+
+  text_t meta, com, op;
+  bool inbraces = false;
+  bool inquotes = false;
+  bool foundcolon = false;
+  text_t::const_iterator here = instring.begin()+5;
+  text_t::const_iterator end = instring.end();
+  while (here != end) {
+    if (*here == '(') inbraces = true;
+    else if (*here == ')') inbraces = false;
+    else if (*here == '\'' && !inquotes) inquotes = true;
+    else if (*here == '\'' && inquotes) inquotes = false;
+    else if (*here == ':' && !inbraces) foundcolon = true;
+    else if (foundcolon) meta.push_back (*here);
+    else if (inquotes) op.push_back (*here);
+    else com.push_back (*here);
+    here ++;
+  }
+
+  instring = meta;
+
+  if (com.empty()) {
+    metaoption.mqualifier.child = cAll;
+    metaoption.functionoptions = " ";
+  }
+  else if (com == "first") {
+    metaoption.mqualifier.child = cNum;
+    metaoption.functionoptions = ".fc";
+  }
+  else if (com == "last") {
+    metaoption.mqualifier.child = cNum;
+    metaoption.functionoptions = ".lc";
+  }
+  else if (com.getint()>0) {
+    metaoption.mqualifier.child = cNum;
+    metaoption.functionoptions = com;
+  }
+  else {
+    metaoption.mqualifier.child = cAll;
+    metaoption.functionoptions = op;
+  }
+}
+
 
 
@@ -546 +604 @@
   if (meta.size() > 7 && (substr (meta.begin(), meta.begin()+6) == "parent")) {
     getParents = true;
+    metaoption.metacommand |= mParent;
     get_parent_options (meta, metaoption);
   } 
@@ -551 +610 @@
     metaoption.metacommand |= mSibling;
     get_sibling_options (meta, metaoption);
+  } 
+  else if (meta.size() > 6 && (substr (meta.begin(), meta.begin()+5) == "child")) {
+    metaoption.metacommand |= mChild;
+    get_child_options (meta, metaoption);
   } 
 
@@ -877 +940 @@
 
 
-// note: all the format_date stuff is assuming that all Date metadata is going to
-// be of the form yyyymmdd, this is of course, crap ;)
-
-static text_t get_meta (ResultDocInfo_t &docinfo, const metadata_t &meta) {
-  
-  // make sure we have the requested metadata
-  MetadataInfo_tmap::iterator it = docinfo.metadata.find (meta.metaname);
-  if (it == docinfo.metadata.end()) return "";
-
+static text_t get_all_meta (MetadataInfo_t &metainfo, const metadata_t &meta) 
+{
+  text_t no_ns_metaname = remove_namespace(meta.metaname);
+
+  text_t tmp;
+  bool first = true;
+  
+  const int start_i=0;
+  const int end_i = metainfo.values.size()-1;
+    
+  for (int i=start_i; i<=end_i; i++) {
+    if (!first) tmp += meta.functionoptions;
+      
+    if (no_ns_metaname == "Date") tmp += format_date (metainfo.values[i]);
+    else if (no_ns_metaname == "Language") tmp += iso639(metainfo.values[i]);
+    else tmp += metainfo.values[i];
+    first = false;
+  }
+    
+  if (meta.metacommand & mCgiSafe) return cgi_safe (tmp);
+  else return tmp;
+}
+
+static text_t get_parent_meta (ResultDocInfo_t &docinfo, const metadata_t &meta) 
+{
+  
   MetadataInfo_t *parent = docinfo.metadata[meta.metaname].parent;
   text_t no_ns_metaname = remove_namespace(meta.metaname);
-  switch (meta.parentcommand) {
+  switch (meta.mqualifier.parent) {
   case pNone:
-    {
-      if (meta.metacommand & mSibling) {
-    text_t tmp;
-    bool first = true;
-
-    MetadataInfo_t& metaname_rec = docinfo.metadata[meta.metaname];
-
-    const int start_i=0;
-    const int end_i = metaname_rec.values.size()-1;
-
-    for (int i=start_i; i<=end_i; i++) {
-      if (!first) tmp += meta.functionoptions;
-      
-      if (no_ns_metaname == "Date") tmp += format_date (metaname_rec.values[i]);
-      else if (no_ns_metaname == "Language") tmp += iso639(metaname_rec.values[i]);
-      else tmp += metaname_rec.values[i];
-      first = false;
-    }
-
-    if (meta.metacommand & mCgiSafe) return cgi_safe (tmp);
-    else return tmp;
-
-      }
-      else {
-
-    text_t classifier_metaname = docinfo.classifier_metadata_type;
-    int metaname_index 
-      = (classifier_metaname == meta.metaname) ? docinfo.classifier_metadata_offset : 0;
-    text_t metadata_item = docinfo.metadata[meta.metaname].values[metaname_index];
-    
-    if (no_ns_metaname == "Date")
-      return format_date (metadata_item);
-    else if (no_ns_metaname == "Language")
-      return iso639(metadata_item);
-    if (meta.metacommand & mCgiSafe) 
-      return cgi_safe (metadata_item);
-    else return metadata_item;
-      }
-    }
+    return "Nothing!!";
+    break;
 
   case pImmediate:
@@ -976 +1019 @@
   }
   return "";
+
+}
+
+static text_t get_child_meta (const text_t& collection, recptproto* collectproto,
+                  ResultDocInfo_t &docinfo, displayclass &disp,
+                  const metadata_t &meta, text_tmap &options,
+                  ostream& logout) 
+{
+  if (docinfo.metadata["contains"].values.size()>0) {
+    
+    text_t& contains = docinfo.metadata["contains"].values[0];
+
+    const text_t& child_metaname = meta.metaname;
+    const text_t& child_field = meta.functionoptions;
+
+    text_tset child_metadata;
+    child_metadata.insert(child_metaname); 
+
+    FilterResponse_t child_response;
+    
+    //get the information associated with the metadata for child doc
+    if (get_info (docinfo.OID+child_field, collection, "", child_metadata, 
+          false, collectproto, child_response, logout)) {
+
+      if (!child_response.docInfo.empty()) {
+    ResultDocInfo_t& child_docinfo = child_response.docInfo[0];
+    
+    MetadataInfo_t& metaname_rec = child_docinfo.metadata[child_metaname];
+    
+    text_t child_metavalue = "";
+    
+    if (meta.mqualifier.child == cNum) {
+      if (metaname_rec.values.size()>0) {
+        child_metavalue = metaname_rec.values[0];
+      }
+    }
+    else if (meta.mqualifier.child == cAll) {
+      child_metavalue = get_all_meta(metaname_rec,meta);
+    }
+    
+    return expand_metadata(child_metavalue,collection,collectproto,
+                   child_docinfo,disp,options,logout);
+      }
+    }
+  }
+
+  return "";
+}
+
+
+
+// note: all the format_date stuff is assuming that all Date metadata is going to
+// be of the form yyyymmdd, this is of course, crap ;)
+
+static text_t get_meta (const text_t& collection, recptproto* collectproto,
+            ResultDocInfo_t &docinfo, displayclass &disp,
+            const metadata_t &meta, text_tmap &options,
+            ostream& logout) {
+  
+  // make sure we have the requested metadata
+  MetadataInfo_tmap::iterator it = docinfo.metadata.find (meta.metaname);
+  if (it == docinfo.metadata.end()) return "";
+
+  text_t no_ns_metaname = remove_namespace(meta.metaname);
+
+  if (meta.metacommand & mParent) {
+    return get_parent_meta(docinfo,meta);
+  }
+  else if (meta.metacommand & mChild) {
+    return get_child_meta(collection,collectproto,docinfo,disp,meta,
+              options,logout);
+  }
+  else if (meta.metacommand & mSibling) {
+    MetadataInfo_t& metaname_rec = docinfo.metadata[meta.metaname];
+    return get_all_meta(docinfo.metadata[meta.metaname],meta);
+  }
+  else {
+    
+    // straightforward metadata request (nothing fancy)
+
+    text_t classifier_metaname = docinfo.classifier_metadata_type;
+    int metaname_index 
+      = (classifier_metaname == meta.metaname) ? docinfo.classifier_metadata_offset : 0;
+    text_t metadata_item = docinfo.metadata[meta.metaname].values[metaname_index];
+    
+    if (no_ns_metaname == "Date")
+      return format_date (metadata_item);
+    else if (no_ns_metaname == "Language")
+      return iso639(metadata_item);
+    if (meta.metacommand & mCgiSafe) 
+      return cgi_safe (metadata_item);
+    else return metadata_item;
+  }
+
+  return "";
 }
 
@@ -1070 +1208 @@
 
 
-static text_t expand_potential_metadata(ResultDocInfo_t &docinfo, 
-                    const text_t& intext)
+static text_t expand_potential_metadata(const text_t& collection, 
+                    recptproto* collectproto,
+                    ResultDocInfo_t &docinfo, 
+                    displayclass &disp,
+                    const text_t& intext,
+                    text_tmap &options,
+                    ostream& logout)
 {
   text_t outtext;
@@ -1090 +1233 @@
 
     parse_meta (meta_text, meta, metadata, getParents); 
-    outtext = get_meta (docinfo,meta);
+    outtext 
+      = get_meta (collection,collectproto,docinfo,disp,meta,options,logout);
   }
   else {
@@ -1102 +1246 @@
 
 
-static bool uses_expression(ResultDocInfo_t &docinfo,
+static bool uses_expression(const text_t& collection, recptproto* collectproto,
+                ResultDocInfo_t &docinfo,
+                displayclass &disp,
                 const text_t& outstring, text_t& lhs_expr,
-                text_t& op_expr, text_t& rhs_expr)
+                text_t& op_expr, text_t& rhs_expr,
+                text_tmap &options,
+                ostream& logout)
 {
   // Note: the string may not be of the form: str1 op str2, however
@@ -1180 +1328 @@
   // metadata terms
 
-  rhs_expr = expand_potential_metadata(docinfo,rhs_expr);
-  lhs_expr = expand_potential_metadata(docinfo,lhs_expr);
+  rhs_expr = expand_potential_metadata(collection,collectproto,docinfo,
+                       disp,rhs_expr,options,logout);
+  lhs_expr = expand_potential_metadata(collection,collectproto,docinfo,
+                       disp,lhs_expr,options,logout);
 
   return true;
@@ -1212 +1362 @@
   // to see whether we output the "then" or the "else" clause
   if (decision.command == dMeta) {
-    if (get_meta (docinfo, decision.meta) != "") {
+    if (get_meta (collection,collectproto,docinfo,disp,decision.meta,options,
+          logout) != "") {
       if (ifptr != NULL)
     return get_formatted_string (collection,collectproto, docinfo, disp, ifptr, 
@@ -1234 +1385 @@
     // (such as [x] eq "y")
     text_t lhs_expr, op_expr, rhs_expr;
-    if (uses_expression(docinfo, outstring,lhs_expr,op_expr,rhs_expr)) {
+    if (uses_expression(collection,collectproto,docinfo, disp, outstring,lhs_expr,op_expr,rhs_expr, options,logout)) {
       if (eval_expression_true(lhs_expr,op_expr,rhs_expr,logout)) {
     if (ifptr != NULL) {
@@ -1358 +1509 @@
      case comMeta:
     {
-       const text_t& metavalue =  get_meta (docinfo, formatlistptr->meta);
+       const text_t& metavalue =  get_meta (collection,collectproto,docinfo, disp,formatlistptr->meta,options,logout);
        return expand_metadata(metavalue, collection, collectproto, docinfo, disp, options, logout);
     }

trunk/gsdl/src/recpt/formattools.h

@@ -37 +37 @@
         comTOC, comImage, comDocumentButtonDetach, comDocumentButtonHighlight,
         comDocumentButtonExpandContents, comDocumentButtonExpandText, comOID, comRank};
+
+enum mcommand_t {mNone=0, mCgiSafe=1, mParent=2, mSibling=4, mChild=8};
+
 enum pcommand_t {pNone, pImmediate, pTop, pAll};
+enum scommand_t {sNone, sAll};
+enum ccommand_t {cNone, cAll, cNum};
 enum dcommand_t {dMeta, dText};
-enum mcommand_t {mNone=0, mCgiSafe=1, mParent=2, mSibling=4};
 
 struct metadata_t {
@@ -47 +51 @@
   text_t metaname;
   int metacommand; // used to hold flags from mcommand_t
-  pcommand_t parentcommand;
+  struct {
+    pcommand_t parent;
+    scommand_t sibling;
+    ccommand_t child;
+  } mqualifier;
+
   text_t functionoptions;
 };