Changeset 7617

Timestamp:

2004-06-18T10:15:15+12:00 (20 years ago)

Author:

davidb

Message:

Metadata in [x] eq '1' updated so can support [parent(Top):x] syntax.

File:

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

trunk/gsdl/src/recpt/formattools.cpp

@@ -1085 +1085 @@
     text_t meta_text = substr (beginbracket+1, endbracket);
 
+    text_tset metadata;
+    bool getParents =false;
     metadata_t meta;
-    meta.metaname = meta_text;
-    meta.parentcommand = pNone;
-    meta.metacommand = mSibling;
-
-    bool getParents =false;
+
+    parse_meta (meta_text, meta, metadata, getParents); 
     outtext = get_meta (docinfo,meta);
   }
@@ -1138 +1137 @@
   }
 
-  if ((rhs_end-rhs_start)<=0) {
+  if ((rhs_end-rhs_start)<0) {
     // no meaningful rhs expression
     return false;
@@ -1147 +1146 @@
 
   // skip over white space
-
   const int to_whitespace = (quoted) ? 2 : 1;
 
@@ -1154 +1152 @@
 
 
-  if (op_end-op_start<=0) {
+  if (op_end-op_start<0) {
     // no meaningful expression operator
     return false;
@@ -1169 +1167 @@
 
   int lhs_end = rscan_over_whitespace(outstring,op_start-1);
-  if (lhs_end<=0) {
+  if (lhs_end<0) {
     // no meaningful lhs expression
     return false;