Changeset 30709 for main/trunk/greenstone2

Timestamp:

2016-08-15T19:50:20+12:00 (8 years ago)

Author:

ak19

Message:

Fix to recent commit (r30681-r30687) to work with escaped colons.

File:

• main/trunk/greenstone2/bin/script/gti.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/gti.pl

@@ -1654 +1654 @@
     my ($chunk_text) = @_;
     
-    $chunk_text =~ s/\\:/ESCAPEDCOLONTEMP/g; # an escaped colon "\:" should only occur in the chunk_key portion of the line
+    $chunk_text =~ s/\\:/ESCAPEDCOLONTEMP/g; # an escaped colon "\:" should only occur in the chunk_key portion of the line.
+    # But it seems to occur in chunk text too now (before http:\\) in dictionary.properties.
 
     # Simple: just remove string key    
     $chunk_text =~ s/^(\S+?)[:|=](\s*)//s;
+
+    if($chunk_key =~ m/ESCAPEDCOLONTEMP/) { # put back the escaped colons
+    $chunk_key =~ s/ESCAPEDCOLONTEMP/\\:/g;
+    }
+
     $chunk_text =~ s/(\s*)$//s;  # Remove any nasty whitespace, carriage returns etc.
     $chunk_text =~ s/(\s*)\#\s+Updated\s+(\d?\d-\D\D\D-\d\d\d\d.*)\s*$//is;