Changeset f5d3b20 for app/src

Timestamp:

05/07/08 14:48:49 (17 years ago)

Author:

obrebski <obrebski@…>

Branches:

master, help

Children:

7562131

Parents:

df77b87

git-author:

obrebski <obrebski@…> (05/07/08 14:48:49)

git-committer:

obrebski <obrebski@…> (05/07/08 14:48:49)

Message:

ser i grp obsluguja tags

git-svn-id: ​svn://atos.wmid.amu.edu.pl/utt@38 e293616e-ec6a-49c2-aa92-f4a8b91c5d16

Location:

app/src

Files:

• grp/grp (modified) (6 diffs)
• ser/ser (modified) (6 diffs)

app/src/grp/grp

@@ -28 +28 @@
 my $eos="seg(EOS)";
 my $morfield='lem';
+my $tags=0;
 
 #read configuration files###########################
@@ -61 +62 @@
                         $action;
                 }
+                elsif($name eq "tags"){
+                        $tags=$value;
+                }
                 elsif(($name eq "help")or($name eq "h")){
                         $help=1;
@@ -78 +82 @@
            "command" => \$show_command,
            "action=s" => \$action,
+           "tags=s" => \$tags,
            "help|h" => \$help);
 
@@ -97 +102 @@
                                     P - postprocess
                                 (default pgP)
+   --tags=STRING                Morphosyntactic tag format.
    --command                    Print the shell command to be executed and exit.
    --help -h                    Help.
@@ -109 +115 @@
     $macrofile or
     -e "$LIB_DIR/terms.m4" and $macrofile="$LIB_DIR/terms.m4";
+
+die("$0: undefined tagset format (tags option missing)") unless
+    $tags;
+
+die("$0: $tags.tag2re program not found") unless
+    1; #JAK NAPISAC WARUNEK???
+
 
 my $uncompress = ($action =~ /u/) ? ' lzop -cd | '  : '';
@@ -132 +145 @@
 # <> expansion
 
-$grepre =~ s/<([^>]+)>/`echo $1 | tag2re`/ge;
+$grepre =~ s/<([^>]+)>/`echo $1 | $tags.tag2re`/ge;
 
 $grepre =~ s/\./[^ [:cntrl:]]/g;

app/src/ser/ser

@@ -26 +26 @@
 my $flex=0;
 my $morfield='lem';
+my $tags=0;
 
 #read configuration files###########################
@@ -56 +57 @@
                         $flextemplate=$value;
                 }
+                elsif($name eq "tags"){
+                        $tags=$value;
+                }
                 elsif($name eq "flex"){
                         $flex=1;
@@ -75 +79 @@
            "macros=s" => \$macros,
            "flex-template=s" => \$flextemplate,
+           "tags=s" => \$tags,
            "flex" => \$flex,
            "help|h" => \$help);
@@ -89 +94 @@
    --macros=FILE                  Read macrodefinitions from FILE.
    --flex-template=FILE           Read flex code template from FILE.
+   --tags=STRING                  Morphosyntactic tag format.
    --only-matching -m             Print only fragments matching PATTERN.
    --no-markers -M                Do not print BOM and EOM markers [TODO].
@@ -107 +113 @@
     $macros or
     -e "$LIB_DIR/terms.m4" and $macros="$LIB_DIR/terms.m4";
+
+die("$0: $tags.tag2re program not found") unless
+    1; #JAK NAPISAC WARUNEK???
+
+die("$0: undefined tagset format (tags option missing)") unless
+    $tags;
 
 
@@ -128 +140 @@
 
 # <> expansion
-$flexpattern =~ s/<([^>]+)>/`echo $1 | tag2re`/ge;
+$flexpattern =~ s/<([^>]+)>/`echo $1 | $tags.tag2re`/ge;
 
 # restricting the value of the . special symbol