Changeset 10782

Timestamp:

2005-10-27T15:21:33+13:00 (18 years ago)

Author:

kjdon

Message:

added in some basic {If} handling. not sure whether it covers all possibilities, but its a start

File:

• trunk/gsdl3/bin/script/convert_coll_from_gs2.pl (modified) (4 diffs)

trunk/gsdl3/bin/script/convert_coll_from_gs2.pl

@@ -481 +481 @@
     #convert [] to <gsf:...>
     # assume no nesting {If} or {Or} for now
-    #remove IFs, for now just make the first option true
-    #$old_format =~ s/\{If\}\{[^,]*,([^,\}]*)(,[^\}]*)?\}/$1/g;
-    #remove ORs, for now just make the first option true
     $old_format =~ s/\{If\}\{([^\}]*)\}/&format_if($1, $node_type)/eg;
     $old_format =~ s/\{Or\}\{([^\}]*)\}/&format_or($1)/eg;
-    # $old_format =~ s/\{Or\}\{([^,]*),[^\}]*\}/$1/g;
     $old_format =~ s/\[Text\]/\<gsf:text\/\>/g;
     $old_format =~ s/\[num\]/\<gsf:num\/\>/g;
-    $old_format =~ s/\[link\]/\<gsf:link\>/g;
+    $old_format =~ s/\[link\]/\<gsf:link type=\'$node_type\'\>/g;
     $old_format =~ s/\[\/link\]/\<\/gsf:link\>/g;
     $old_format =~ s/\[srclink\]/\<gsf:link type=\'source\'\>/g;
     $old_format =~ s/\[\/srclink\]/\<\/gsf:link\>/g;
-    $old_format =~ s/\[icon\]/\<gsf:icon\/\>/g;
+    $old_format =~ s/\[icon\]/\<gsf:icon type=\'$node_type\'\/\>/g;
     $old_format =~ s/\[srcicon\]/\<gsf:icon type=\'source\'\/\>/g;
           
@@ -501 +497 @@
     #now do the rest of the [] which are assumed to be metadata
     $old_format =~ s/\[([^\]]*)\]/&format_metadata($1)/eg;
- #   $old_format =~ s/\[([^\]]*\:)?([^\]\:]*)\]/\<gsf:metadata name=\'$2\' select=\'$1\'\/\>/g;
- #   # remove ex.
- #   $old_format =~ s/<gsf:metadata name=\'ex\.([^\']+)\'/<gsf:metadata name=\'$1\'/g;
- #   #do the parent stuff
- #   $old_format =~ s/(select=\'parent)\:\'/$1\'/g;
- #   $old_format =~ s/select=\'parent\(Top\)\:\'/select=\'root\'/g;
- #   $old_format =~ s/select=\'parent\(All\)\:\'/select=\'ancestors\'/g;
- #   $old_format =~ s/select=\'parent\(All\'([^\']*)\'\)\:\'/select=\'ancestors\' separator=\'$1\'/g;
- #   #remove any select=''
- #   $old_format =~ s/select=\'\'//g;
   
     # some html tidy
@@ -553 +539 @@
     $metadata_string =~ s/^\((Top|All)\)?//;
     if ($scope) {
-        ($delim) = $metadata_string =~ /^:\'([^\']*)\'\)/;
-        $metadata_string =~ s/^:\'([^\']*)\'\)//;
+        ($delim) = $metadata_string =~ /^\'([^\']*)\'\)/;
+        $metadata_string =~ s/^\'([^\']*)\'\)//;
     } 
     }
@@ -594 +580 @@
 
     my ($if_string, $node_type) = @_;
-
-    return "if statement to go here";
+    #print STDERR "if string = $if_string\n";
+
+    my @parts = split /,/, $if_string; 
+    my $test = $parts[0];
+    my $true_option = $parts[1];
+    my $false_option;
+    if (scalar (@parts) == 3) {
+    $false_option = $parts[2];
+    }
+    $test =~ s/^\s*//;
+    $test =~ s/\s*$//;
+    my ($test_meta, $test_type, $test_value);
+    if ($test =~ /^(\[.+\])$/) {
+    $test_meta = $1;
+    $test_type = 'exists';
+    } else {
+    my ($lhs, $exp, $rhs) = $test =~ /^(.+)\s+(eq|ne|lt|gt|le|ge|sw|ew)\s+(.+)$/;
+    #print STDERR "lhs, exp, rhs = $lhs, $exp, $rhs\n";
+    if ($exp eq "eq") {
+        $test_type = "equals";
+    } elsif ($exp eq "sw") {
+        $test_type = "startsWith";
+    } elsif ($exp eq "ew") {
+        $test_type = "endsWith";
+    } elsif ($exp eq "ne") {
+        $test_type = "notEquals";
+    } elsif ($exp eq "lt") {
+        $test_type = "lessThan";
+    }elsif ($exp eq "gt") {
+        $test_type = "greaterThan";
+    }elsif ($exp eq "le") {
+        $test_type = "lessThanOrEquals";
+    }elsif ($exp eq "ge") {
+        $test_type = "greaterThanOrEquals";
+    }
+    if ($lhs =~ /^\[.+\]$/) {
+        $test_meta = $lhs;
+        $test_value = $rhs;
+    } else {
+        # assume rhs has meta
+        $test_meta = $rhs;
+        $test_value = $lhs;
+    }
+    
+    #remove beginning and end quotes
+    $test_value =~ s/^[\'\"]//;
+    $test_value =~ s/[\'\"]$//;
+    }
+    my $test_atts = "test='$test_type' ";
+    if (defined $test_value) {
+    $test_atts .= "test-value='$test_value' ";
+    }
+    #print STDERR "test, true, false = $test, $true_option, $false_option\n";
+    my $new_format = "<gsf:switch>$test_meta";
+    $new_format .= "<gsf:when $test_atts>$true_option</gsf:when>";
+    if (defined $false_option) {
+    $new_format .="<gsf:otherwise>$false_option</gsf:otherwise>";
+    }
+    $new_format .= "</gsf:switch>";
+    
+    #print STDERR "new format = $new_format\n";
+    return $new_format;
 }