updated branches to current head of trunk

git-svn-id: file:///home/dpavlin/private/svn/webpac/branches/hidra@291 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/all2xml.pl b/all2xml.pl
index 9245908..0ffee07 100755 (executable)
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -245,7 +245,7 @@ sub data2xml {
 
                        # what will separate last line from this one?
                        if ($display_data && $x->{append}) {
-                               $line_delimiter = ' ';
+                               $line_delimiter = $delimiter;
                        } elsif ($display_data) {
                                $line_delimiter = '<br/>';
                        }

diff --git a/import_xml/convert_delimiter.pl b/import_xml/convert_delimiter.pl
index 230cd2a..48576ad 100755 (executable)
--- a/import_xml/convert_delimiter.pl
+++ b/import_xml/convert_delimiter.pl
@@ -14,7 +14,11 @@ foreach my $file (@ARGV) {
 
        close(XML);
 
+<<<<<<< .working
        if ($xml =~ s,<(\w+)\s+delimiter\s*=\s*"(\s[^"]+|[^"]+\s)"\s*>(.*?)</\1>,<$1>\n\t\t\t<delimiter>$2</delimiter>\n\t\t\t<value>$3</value>\n\t\t</$1>,gis) {
+=======
+       if ($xml =~ s,<(\w+)(\s+[^>]*)delimiter\s*=\s*"(\s[^"]+|[^"]+\s)"([^>]*)>(.*?)</\1>,<$1$2$4>\n\t\t\t<delimiter>$3</delimiter>\n\t\t\t<value>$5</value>\n\t\t</$1>,gis) {
+>>>>>>> .merge-right.r290
                open(XML,"> $file-new") || die "can't create '$file-new': $!";
                print XML $xml;
                close(XML);