Changeset 10415

Timestamp:

2005-08-04T12:09:41+12:00 (19 years ago)

Author:

kjdon

Message:

fixed up the metadata format handling. made child metadata work, and made child:sibling, and parent:sibling work. full details about the new formats available in the faq

Location:

trunk/gsdl/src/recpt

Files:

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

trunk/gsdl/src/recpt/formattools.cpp

@@ -60 +60 @@
   mqualifier.sibling = sNone;
   mqualifier.child   = cNone;
-  functionoptions.clear();
+  parentoptions.clear();
+  siblingoptions.clear();
+  childoptions.clear();
 }
 
@@ -490 +492 @@
   text_t::const_iterator end = instring.end();
   while (here != end) {
-    if (*here == '(') inbraces = true;
+    if (foundcolon) meta.push_back (*here);
+    else 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);
@@ -508 +510 @@
   else if (com == "All") {
     metaoption.mqualifier.parent = pAll;
-    metaoption.functionoptions = op;
+    metaoption.parentoptions = op;
   }
 }
@@ -517 +519 @@
   assert (instring.size() > 8);
   if (instring.size() <= 8) return;
-
   text_t meta, com, op;
   bool inbraces = false;
@@ -525 +526 @@
   text_t::const_iterator end = instring.end();
   while (here != end) {
-    if (*here == '(') inbraces = true;
+    if (foundcolon) meta.push_back (*here);
+    else 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 (*here == ':' && !inbraces) foundcolon = true;    
     else if (inquotes) op.push_back (*here);
     else com.push_back (*here);
@@ -537 +538 @@
 
   instring = meta;
+  metaoption.siblingoptions.clear();
 
   if (com.empty()) {
     metaoption.mqualifier.sibling = sAll;
-    metaoption.functionoptions = " ";
+    metaoption.siblingoptions = " ";
+  }
+  else if (com == "first") {
+    metaoption.mqualifier.sibling = sNum;
+    metaoption.siblingoptions = "0";
+  }
+  else if (com == "last") {
+    metaoption.mqualifier.sibling = sNum;
+    metaoption.siblingoptions = "-2"; // == last
+  }
+  else if (com.getint()>0) {
+    metaoption.mqualifier.sibling = sNum;
+    int pos = com.getint()-1;
+    metaoption.siblingoptions +=pos;
   }
   else {
     metaoption.mqualifier.sibling = sAll;
-    metaoption.functionoptions = op;
+    metaoption.siblingoptions = op;
   }
 }
@@ -552 +567 @@
   assert (instring.size() > 6);
   if (instring.size() <= 6) return;
-
   text_t meta, com, op;
   bool inbraces = false;
@@ -560 +574 @@
   text_t::const_iterator end = instring.end();
   while (here != end) {
-    if (*here == '(') inbraces = true;
+    if (foundcolon) meta.push_back (*here);
+    else 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);
@@ -572 +586 @@
 
   instring = meta;
-
   if (com.empty()) {
     metaoption.mqualifier.child = cAll;
-    metaoption.functionoptions = " ";
+    metaoption.childoptions = " ";
   }
   else if (com == "first") {
     metaoption.mqualifier.child = cNum;
-    metaoption.functionoptions = ".fc";
+    metaoption.childoptions = ".fc";
   }
   else if (com == "last") {
     metaoption.mqualifier.child = cNum;
-    metaoption.functionoptions = ".lc";
+    metaoption.childoptions = ".lc";
   }
   else if (com.getint()>0) {
     metaoption.mqualifier.child = cNum;
-    metaoption.functionoptions = com;
+    metaoption.childoptions = "."+com;
   }
   else {
     metaoption.mqualifier.child = cAll;
-    metaoption.functionoptions = op;
+    metaoption.childoptions = op;
   }
 }
@@ -610 +623 @@
     get_parent_options (meta, metaoption);
   } 
-  else if (meta.size() > 8 && (substr (meta.begin(), meta.begin()+7) == "sibling")) {
+  else if (meta.size() > 6 && (substr (meta.begin(), meta.begin()+5) == "child")) {
+    metaoption.metacommand |= mChild;
+    get_child_options (meta, metaoption);
+    metadata.insert("contains");
+  } 
+  // parent and child can have sibling also
+  if (meta.size() > 8 && (substr (meta.begin(), meta.begin()+7) == "sibling")) {
     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);
-  } 
-
+  
   // check for ex. which may occur in format statements
   if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.")) {
@@ -958 +973 @@
 }
 
-
-static text_t get_all_meta (MetadataInfo_t &metainfo, const metadata_t &meta) 
+// position -1 for all, -2 for the last, 0 for the first, or x for a particular piece
+// metainfo has all the values for the metadata, meta has the request metadata name and options, position tells which values to get
+static text_t get_formatted_meta_text(MetadataInfo_t &metainfo, const metadata_t &meta, int position, bool no_cgisafe = false) 
 {
   text_t no_ns_metaname = remove_namespace(meta.metaname);
-
   text_t tmp;
   bool first = true;
@@ -968 +983 @@
   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 (position == -1) { // all
+    for (int i=start_i; i<=end_i; ++i) {
+      if (!first) tmp += meta.siblingoptions;
+      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 (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 {
+    if (position == -2) { // end
+      position = end_i;
+    } else if (position < start_i || position > end_i) {
+      return "";
+    }
+    if (no_ns_metaname == "Date") tmp += format_date (metainfo.values[position]);
+    else if (no_ns_metaname == "Language") tmp += iso639(metainfo.values[position]);
+    else tmp += metainfo.values[position];
+  }
+  if (meta.metacommand & mCgiSafe && !no_cgisafe) return cgi_safe (tmp);
   else return tmp;
 }
 
-static text_t get_parent_meta (ResultDocInfo_t &docinfo, const metadata_t &meta) 
+static text_t get_parent_meta (ResultDocInfo_t &docinfo, const metadata_t &meta, int siblings_values) 
 {
   
   MetadataInfo_t *parent = docinfo.metadata[meta.metaname].parent;
-  text_t no_ns_metaname = remove_namespace(meta.metaname);
   switch (meta.mqualifier.parent) {
   case pNone:
@@ -994 +1018 @@
   case pImmediate:
     if (parent != NULL) {
-      if (no_ns_metaname == "Date") 
-    return format_date (parent->values[0]);
-      if (meta.metacommand & mCgiSafe) 
-    return cgi_safe (parent->values[0]);
-      else return parent->values[0];
+      return get_formatted_meta_text(*parent, meta, siblings_values);
     }
     break;
@@ -1005 +1025 @@
     if (parent != NULL) {
       while (parent->parent != NULL) parent = parent->parent;
-
-      if (no_ns_metaname == "Date") 
-    return format_date (parent->values[0]);
-      if (meta.metacommand & mCgiSafe) 
-    return cgi_safe (parent->values[0]);
-      else return parent->values[0];
+      return get_formatted_meta_text(*parent, meta, siblings_values);
     }
     break;
@@ -1019 +1034 @@
       text_tarray tmparray;
       while (parent != NULL) {
-    tmparray.push_back (parent->values[0]);
+    tmparray.push_back (get_formatted_meta_text(*parent, meta, siblings_values, true)); // set no_cgisafe to true, as we'll do it once we have all the metadata
     parent = parent->parent;
       }
+      // now join them up - use teh parent separator
       bool first = true;
       text_t tmp;
@@ -1027 +1043 @@
       text_tarray::reverse_iterator end = tmparray.rend();
       while (here != end) {
-    if (!first) tmp += meta.functionoptions;
-    if (no_ns_metaname == "Date") tmp += format_date (*here);
-    else tmp += *here;
+    if (!first) tmp += meta.parentoptions;
+    tmp += *here;
     first = false;
     ++here;
@@ -1045 +1060 @@
                   ResultDocInfo_t &docinfo, displayclass &disp,
                   const metadata_t &meta, text_tmap &options,
-                  ostream& logout) 
+                  ostream& logout, int siblings_values) 
 {
-  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;
-    
+  if (docinfo.metadata["contains"].values[0].size()==0) return ""; // no children
+  
+  const text_t& child_metaname = meta.metaname;
+  const text_t& child_field = meta.childoptions;
+  text_tset child_metadata;
+  child_metadata.insert(child_metaname); 
+
+  FilterResponse_t child_response;
+  if (meta.mqualifier.child == cNum) {
+    // just one child
     //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,
+    if (!get_info (docinfo.OID+child_field, collection, "", child_metadata, 
+           false, collectproto, child_response, logout)) return ""; // invalid child number
+
+      if (child_response.docInfo.empty()) return false; // no info for the child
+  
+      ResultDocInfo_t& child_docinfo = child_response.docInfo[0];
+      MetadataInfo_t& metaname_rec = child_docinfo.metadata[child_metaname];
+  
+      text_t child_metavalue = get_formatted_meta_text(metaname_rec,meta,siblings_values);
+      return expand_metadata(child_metavalue,collection,collectproto,
+             child_docinfo,disp,options,logout);
+  }
+  
+    
+  if (meta.mqualifier.child != cAll) return false; // invalid qualifier
+  
+  // we need to get all children
+  text_t result = "";
+  text_tarray children;
+  text_t contains = docinfo.metadata["contains"].values[0];
+  splitchar (contains.begin(), contains.end(), ';', children);
+  text_tarray::const_iterator here = children.begin();
+  text_tarray::const_iterator end = children.end();
+  bool first = true;
+  while (here !=end) {
+    text_t oid = *here;
+    here++;
+    if (*(oid.begin()) == '"') translate_parent (oid, docinfo.OID);
+    
+    
+    //get the information associated with the metadata for child doc
+    if (!get_info (oid, collection, "", child_metadata, 
+           false, collectproto, child_response, logout) ||
+    child_response.docInfo.empty()) {
+      first = false;
+      continue;
+    }
+    
+    
+    ResultDocInfo_t& child_docinfo = child_response.docInfo[0];
+    MetadataInfo_t& metaname_rec = child_docinfo.metadata[child_metaname];
+    
+    text_t child_metavalue = get_formatted_meta_text(metaname_rec,meta,siblings_values);
+    if (!first) result += child_field;
+    first = false;
+    // need to do this here cos otherwise we are in the wrong document
+    result +=  expand_metadata(child_metavalue,collection,collectproto,
                    child_docinfo,disp,options,logout);
-      }
-    }
-  }
-
-  return "";
-}
-
+  }
+  return result;
+    
+}
 
 
@@ -1102 +1139 @@
   if (it == docinfo.metadata.end()) return "";
 
-  text_t no_ns_metaname = remove_namespace(meta.metaname);
-
+  int siblings_values = 0; // default is no siblings, just the first metadata available
+  if (meta.metacommand & mSibling) {
+    if (meta.mqualifier.sibling == sAll) {
+      siblings_values = -1; //all
+    } else if (meta.mqualifier.sibling == sNum) {
+      siblings_values = meta.siblingoptions.getint();
+    }
+  }
   if (meta.metacommand & mParent) {
-    return get_parent_meta(docinfo,meta);
-  }
+    return get_parent_meta(docinfo,meta,siblings_values);
+  }
+
   else if (meta.metacommand & mChild) {
     return get_child_meta(collection,collectproto,docinfo,disp,meta,
-              options,logout);
-  }
-  else if (meta.metacommand & mSibling) {
+                options,logout, siblings_values);
+  }
+  else if (meta.metacommand & mSibling) { // only siblings
     MetadataInfo_t& metaname_rec = docinfo.metadata[meta.metaname];
-    return get_all_meta(docinfo.metadata[meta.metaname],meta);
+    return get_formatted_meta_text(docinfo.metadata[meta.metaname],meta, siblings_values);
   }
   else {
@@ -1122 +1166 @@
     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 get_formatted_meta_text(docinfo.metadata[meta.metaname], meta, metaname_index);
+  }
+  
   return "";
 }
@@ -1473 +1509 @@
                   ostream &logout) {
       
-   if (includes_metadata(metavalue))
-      {
-     // text has embedded metadata in it => expand it
-     FilterRequest_t request;
-     FilterResponse_t response;
-
-     request.getParents = false;
-      
-     format_t *expanded_formatlistptr = new format_t();
-     parse_formatstring (metavalue, expanded_formatlistptr, 
-                 request.fields, request.getParents);
-      
-     // retrieve metadata
-     get_info(docinfo.OID, collection, "", request.fields, request.getParents,
-          collectproto, response, logout);
-     
-     if (!response.docInfo.empty())
-        {
-           text_t expanded_metavalue
-         = get_formatted_string(collection, collectproto,
-                     response.docInfo[0], disp, expanded_formatlistptr, 
-                     options, logout);
-          
-           return expanded_metavalue;
-        }
-     else
-        {
-           return metavalue;
-        }
-      }
-   else
-      {
-     return metavalue;
-      }
+  if (includes_metadata(metavalue)) {
+    
+    // text has embedded metadata in it => expand it
+    FilterRequest_t request;
+    FilterResponse_t response;
+    
+    request.getParents = false;
+    
+    format_t *expanded_formatlistptr = new format_t();
+    parse_formatstring (metavalue, expanded_formatlistptr, 
+            request.fields, request.getParents);
+    
+    // retrieve metadata
+    get_info(docinfo.OID, collection, "", request.fields, request.getParents,
+         collectproto, response, logout);
+    
+    if (!response.docInfo.empty()) {
+      
+      text_t expanded_metavalue
+    = get_formatted_string(collection, collectproto,
+                   response.docInfo[0], disp, expanded_formatlistptr, 
+                   options, logout);
+      
+      return expanded_metavalue;
+    }
+    else {
+      return metavalue;
+    }
+  }
+  else {
+    
+    return metavalue;
+  }
 }
 

trunk/gsdl/src/recpt/formattools.h

@@ -41 +41 @@
 
 enum pcommand_t {pNone, pImmediate, pTop, pAll};
-enum scommand_t {sNone, sAll};
+enum scommand_t {sNone, sAll, sNum};
 enum ccommand_t {cNone, cAll, cNum};
 enum dcommand_t {dMeta, dText};
@@ -57 +57 @@
   } mqualifier;
 
-  text_t functionoptions;
+  text_t parentoptions;
+  text_t siblingoptions;
+  text_t childoptions;
 };