Changeset 1258

Timestamp:

2000-06-30T12:46:17+12:00 (24 years ago)

Author:

nzdl

Message:

caught New_Config_Format-branch up with changes to trunk

Location:

branches/New_Config_Format-branch/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (2 diffs)
• formattools.cpp (modified) (6 diffs)

branches/New_Config_Format-branch/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.37.2.2  2000/06/30 00:46:16  nzdl
+   caught New_Config_Format-branch up with changes to trunk
+
    Revision 1.37.2.1  2000/04/09 23:16:46  sjboddie
    Added DocumentColumns stuff to New_Config_Format-branch branch
@@ -181 +184 @@
 #include "querytools.h"
 #include "unitool.h"
-#include "htmlutils.h"
+#include "gsdltools.h"
 
 documentaction::documentaction () {

branches/New_Config_Format-branch/gsdl/src/recpt/formattools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.20.2.2  2000/06/30 00:46:17  nzdl
+   caught New_Config_Format-branch up with changes to trunk
+
+
+   Revision 1.21  2000/06/30 00:40:39  sjboddie
+   Tidied up a bit. Fixed bug in formattools. Nested If/Or's should now
+   work within formatstrings.
+
    Revision 1.20.2.1  2000/04/09 23:16:48  sjboddie
    Added DocumentColumns stuff to New_Config_Format-branch branch
+
+   Revision 1.20  2000/04/07 04:40:44  sjboddie
+   Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
+   from DocumentColumns stuff. I'll move the DocumentColumns stuff to a
+   separate development branch (New_Config_Format-branch) for now. The plan
+   is to redesign the configuration file format a bit and limit the number of
+   distributions floating around that take different configuration formats).
 
    Revision 1.19  2000/04/03 07:28:24  sjboddie
@@ -102 +117 @@
 #include "formattools.h"
 #include "cgiutils.h"
+#include <assert.h>
 
 // a few function prototypes
@@ -158 +174 @@
   while (here != end) {
     if (*here != ' ') {
-      if (*here == '<') {
+      if ((*here == '<') && ((here+3) < end)) {
     if ((*(here+1) == 't' || *(here+1) == 'T') &&
         (*(here+2) == 'd' || *(here+2) == 'D') &&
@@ -244 +260 @@
 
 static void get_parent_options (text_t &instring, metadata_t &metaoption) {
+
+  assert (instring.size() > 7);
+  if (instring.size() <= 7) return;
 
   text_t meta, com, op;
@@ -328 +347 @@
   while (here != end) {
 
-    if (*here == '\\')
-      text.push_back (*(++here));
-
-    else if (*here == '{') {
+    if (*here == '\\') {
+      here ++;
+      if (here != end) text.push_back (*here);
+
+    } else if (*here == '{') {
       if (!text.empty()) {
     formatlistptr->command = comText;
@@ -438 +458 @@
 
     } else {
-      // assume it's plain text
-      or_ptr->command = comText;
-      or_ptr->text = text;
+      parse_string (text, or_ptr, metadata, getParents);
     }
     text.clear();