Changeset 30484

Timestamp:

2016-04-26T19:22:56+12:00 (8 years ago)

Author:

ak19

Message:

Bugfix by DLConsulting's Andrew Holland submitted via email on 14/04/16 and merged into the code today.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

@@ -1522 +1522 @@
   text_t outtext;
 
+  // Check if the string is empty. If it is, do not do anything
+  if (intext.empty())
+  {
+    outtext = intext;
+    return outtext;
+  }
+
   // decide if dealing with metadata or text
 
@@ -1587 +1594 @@
   if ((potential_quote == '\'') || (potential_quote == '\"')) {
     --rhs_end;
-    rhs_start = rscan_for(outstring,rhs_end-1,potential_quote) +1;
+    // We have already decremented rhs_end, so we want to look at the current value for rhs_end (allows empty quoted strings)
+    rhs_start = rscan_for(outstring,rhs_end,potential_quote) +1;
     quoted = true;
   }
@@ -1594 +1602 @@
   }
 
-  if ((rhs_end-rhs_start)<0) {
+  // Allow empty quoted strings
+  if ((rhs_end-rhs_start)<0 && !quoted) {
     // no meaningful rhs expression
     return false;