Changeset 22264

Timestamp:

2010-06-14T15:37:40+12:00 (14 years ago)

Author:

kjdon

Message:

greenstone doesn't like digit only macros when they appear inside other macros - it thinks they are parameter references. This happens for field names inside _jselection_ etc. So make sure short names are not just digits.

File:

• main/trunk/greenstone2/perllib/basebuilder.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/basebuilder.pm

@@ -630 +630 @@
     $a = 'a' unless defined $a;
     $b = '0' unless defined $b;
-
-    return "$a$b";
+    
+    my $newfield = "$a$b";
+    if ($newfield =~ /^\d\d$/) {
+    # digits only - Greenstone runtime doesn't like this.
+    $newfield = "a$a";
+    }
+    return $newfield;
     
 }