Changeset 4178

Timestamp:

2003-04-17T14:04:33+12:00 (21 years ago)

Author:

mdewsnip

Message:

Fairly extensive changes to incorporate the changes into the macrofiles, rather than generating the macrofiles from the translation database. This is much better because a diff between the version in CVS and the output from the translator with now be sensible (because the macros have not been rearranged and the comments lost).

File:

• trunk/gsdl/bin/script/submit_translation.pl (modified) (4 diffs)

trunk/gsdl/bin/script/submit_translation.pl

@@ -85 +85 @@
     my $submissions = &parse_user_submission($sourcelang, $targetlang, $targetcode,
                          util::filename_cat($translationdir, $argsfile));
-    # print "Submissions:\n";
-    # &display_hash($submissions);
 
     # Add the submissions to the translation database
@@ -93 +91 @@
     # Writes the target macro files
     my $macrosdir = util::filename_cat($gsdldir, "macros");
-    &write_target_macro_files($sourcelang, $targetlang, $macrosdir);
-
-    # Generate all the images for both macro files
-    # my $imagesdir = util::filename_cat($gsdldir, "images", $targetcode);
-    # my $scriptdir = util::filename_cat($gsdldir, "bin", "script");
-
-    # my $targetdmfile1 = util::filename_cat($macrosdir, $targetlang . ".dm");
-    # my $genimagescmd1 = "perl " . util::filename_cat($scriptdir, "translate.pl") .
-    # " -language_symbol $targetcode -image_dir $imagesdir $targetdmfile1";
-    # $genimagescmd1 = "cd $gsdldir ; source setup.bash ; $genimagescmd1";
-    # open SUBMIT_SCRIPT_1, ">" . util::filename_cat($translationdir, "submit1.tmp");
-    # print SUBMIT_SCRIPT_1 "$genimagescmd1\n";
-    # close SUBMIT_SCRIPT_1;
-
-    # my $targetdmfile2 = util::filename_cat($macrosdir, $targetlang . "2.dm");
-    # my $genimagescmd2 = "perl -S " . util::filename_cat($scriptdir, "translate.pl") .
-    # " -language_symbol $targetcode -image_dir $imagesdir $targetdmfile2";
-    # print STDERR "Command 2: $genimagescmd2\n";
-    # my $result2 = system($genimagescmd2);
-    # `$genimagescmd2`;
-    # print STDERR "Result 2: $result2\n";
+    &update_target_macrofiles($targetlang, $macrosdir, $submissions);
 
     # Clean up
@@ -278 +256 @@
 
 
-sub display_hash
-{
-    my ($hash) = @_;
-
-    foreach $key (sort (keys %$hash)) {
-    print $key . "\n";
-    print $hash->{$key} . "\n";
-    }
-}
-
-
 sub add_submissions_to_database
 {
@@ -305 +272 @@
 
 
-sub write_target_macro_files
-{
-    my ($sourcelang, $targetlang, $macrosdir) = @_;
-
-    my $targetdmfile1 = util::filename_cat($macrosdir, &get_macrofile_name($targetlang, ""));
-    my $targetdmfile2 = util::filename_cat($macrosdir, &get_macrofile_name($targetlang, "2"));
-
-    my $currentfile = "1";
-    my $currentpackage = "";
-    my %textmacros = ();
-    my %iconmacros = ();
-
-    open(TARGET_DM_FILE, ">$targetdmfile1") or die "Error: Could not write file.\n";
-
-    # Find all the target keys in the database
-    foreach $key (sort (keys %translationdata)) {
-    my $macrofile = $key;
-    $macrofile =~ s/^([^:]+)::(.*)/$1/;
-
-    # Check if this is a target macro
-    if ($macrofile eq &get_macrofile_name($targetlang, "") ||
-        $macrofile eq &get_macrofile_name($targetlang, "2")) {
-
-        # Detect the point where we start on the auxiliary macros
-        if ($macrofile eq &get_macrofile_name($targetlang, "2") && $currentfile eq "1") {
-        # Write the macros for the package just finished
-        &write_macros(TARGET_DM_FILE, $currentpackage, $textmacros, $iconmacros);
-        close TARGET_DM_FILE;
-
-        # Start a new package
-        $currentpackage = "";
-        $textmacros = ();
-        $iconmacros = ();
-
-        # Start the next file
-        $currentfile = "2";
-        open(TARGET_DM_FILE, ">$targetdmfile2") or die "Error: Could not write file.\n";
-        }
-
-        my $targetpackage = $key;
-        $targetpackage =~ s/^([^:])+::(.*)::(.*)/$2/;
-
-        my $macroname = $key;
-        $macroname =~ s/^([^:])+::(.*)::(.*)/$3/;
-
-        if ($targetpackage ne $currentpackage) {
-        if ($currentpackage ne "") {
-            # Write the macros for the package just finished
-            &write_macros(TARGET_DM_FILE, $currentpackage, $textmacros, $iconmacros);
+sub update_target_macrofiles
+{
+    my ($targetlang, $macrosdir, $submissions) = @_;
+
+    # Split the submissions by macrofile
+    my %submissions1 = ();
+    my %submissions2 = ();
+    foreach $key (keys %$submissions) {
+    if (&core_or_auxiliary_macro($targetlang, $key) eq "core") {
+        $submissions1->{$key} = $submissions->{$key};
+    }
+    else {
+        $submissions2->{$key} = $submissions->{$key};
+    }
+    }
+
+    # Add the submissions into the appropriate files
+    my $macrofile1 = &get_macrofile_name($targetlang, "");
+    &add_submissions_into_macrofile($targetlang, $macrosdir, $macrofile1, $submissions1);
+    my $macrofile2 = &get_macrofile_name($targetlang, "2");
+    &add_submissions_into_macrofile($targetlang, $macrosdir, $macrofile2, $submissions2);
+}
+
+
+sub core_or_auxiliary_macro
+{
+    my ($language, $sourcekey) = @_;
+
+    my $macrofile = $sourcekey;
+    $macrofile =~ s/^([^:]+)::(.*)/$1/;
+
+    if ($macrofile eq ($language . ".dm")) {
+    return "core";
+    }
+    if ($macrofile eq ($language . "2.dm")) {
+    return "auxiliary";
+    }
+}
+
+
+sub add_submissions_into_macrofile
+{
+    my ($targetlang, $macrosdir, $macrofile, $submissions) = @_;
+
+    # Opens the macro file or dies a miserable death
+    my $macropath = util::filename_cat($macrosdir, $macrofile);
+    open(MACROFILE_IN, "<$macropath") or die "Error: Could not open $macropath.\n";
+    open(MACROFILE_TMP, ">$macrofile.tmp") or die "Error: Could not write $macrofile.tmp\n";
+
+    my $curroutline = 0;
+    my $currpackage;
+    my $currpackageinsertionpoint = $curroutline;
+    my %insertionpoints = ();
+    while (<MACROFILE_IN>) {
+    #currline++;
+
+    # Check if a new package is being defined
+    if (/^package (.*)/) {
+        # Is this the end of a previous package?
+        if ($currpackage) {
+        # Yes, so remember the insertion point for the package
+        $insertionpoints{$currpackageinsertionpoint} = $currpackage;
+        }
+        $currpackage = $1;
+        print MACROFILE_TMP $_;
+        $curroutline++;
+    }
+
+    # Check if an icon macro is being defined
+    elsif (/^(\#\# .*)/) {
+        my $iconmacro = $1;
+
+        # In the case where the macroname contains a new line, read the next line too
+        unless ($iconmacro =~ m/^\#\# .*\#\#/) {
+        $iconmacro .= "\n" . <MACROFILE_IN>;
+        chomp($iconmacro);
+        # $currline++;
+        $curroutline++;
+        }
+
+        # Split the icon macro header on "##"
+        my @iconparts = split(/\s*\#\#\s*/, $iconmacro);
+        # The macroname is the last element of the header (ie. ## ... ## ... ## this ##)
+        my $macroname = $iconparts[(scalar @iconparts) - 1];
+
+        # The key consists of macro file, package name, and macro name
+        my $macrokey = $macrofile . "::" . $currpackage . "::" . $macroname;
+
+        # Check if this macro has just been submitted
+        my $newsubmission = "false";
+        if ($submissions->{$macrokey}) {
+        # It has, so write the submitted text
+        $newsubmission = "true";
+        print MACROFILE_TMP $submissions->{$macrokey} . "\n";
+        $count = ($submissions->{$macrokey} =~ tr/\n/\n/);
+        $curroutline = $curroutline + $count;
+        delete $submissions->{$macrokey};
+        }
+        else {
+        # It hasn't, so write the old macro
+        print MACROFILE_TMP $iconmacro . "\n";
+        $curroutline++;
+        }
+
+        # Chew up the old macro text, spitting it out if necessary
+        do {
+        $_ = <MACROFILE_IN>;
+        # $currline++;
+        if ($newsubmission ne "true") {
+            print MACROFILE_TMP $_;
+            $curroutline++;
         }
-
-        # Start a new package
-        $currentpackage = $targetpackage;
-        $textmacros = ();
-        $iconmacros = ();
-        }
-
-        # Determine whether this is a text or icon macro
-        my $macrotext = $translationdata{$key};
-        if ($macrotext =~ m/\#\# (^|.)*/) {
-        $iconmacros->{$macroname} = $macrotext;
+        } until ($_ =~ /^\s+/);
+
+        # Remember where this macro finished
+        $currpackageinsertionpoint = $curroutline;
+    }
+
+    # Check if a text macro is being defined
+    elsif (/^(_\w+_)(.*)/) {
+        # Get the name of the macro
+        my $macroname = $1;
+        print MACROFILE_TMP $macroname;
+
+        # The key consists of macro file, package name, and macro name
+        my $macrokey = $macrofile . "::" . $currpackage . "::" . $macroname;
+
+        # Check if this macro has just been submitted
+        my $newsubmission = "false";
+        if ($submissions->{$macrokey}) {
+        # It has, so write the submitted text
+        $newsubmission = "true";
+        print MACROFILE_TMP $submissions->{$macrokey};
+        $count = ($submissions->{$macrokey} =~ tr/\n/\n/);
+        $curroutline = $curroutline + $count;
+        delete $submissions->{$macrokey};
         }
         else {
-        $textmacros->{$macroname} = $macrotext;
-        }
-    }
-    }
-
-    # Write the macros for the last package of the last file
-    &write_macros(TARGET_DM_FILE, $currentpackage, $textmacros, $iconmacros);
-    close TARGET_DM_FILE;
-}
-
-
-sub write_macros
-{
-    my ($fh, $packagename, $textmacros, $iconmacros) = @_;
-
-    # Write package header
-    print $fh "\n";
-    print $fh "######################################################################\n";
-    print $fh "package $packagename\n";
-    print $fh "######################################################################\n";
-
-    # Write text macros
-    print $fh "\n";
-    print $fh "#------------------------------------------------------------\n";
-    print $fh "# text macros\n";
-    print $fh "#------------------------------------------------------------\n";
-    print $fh "\n";
-    foreach $textkey (sort (keys %$textmacros)) {
-    print $fh $textkey . $textmacros->{$textkey} . "\n";
-    }
-
-    # Write icon macros
-    print $fh "#------------------------------------------------------------\n";
-    print $fh "# icons\n";
-    print $fh "#------------------------------------------------------------\n";
-    print $fh "\n";
-    foreach $iconkey (sort (keys %$iconmacros)) {
-    print $fh $iconmacros->{$iconkey} . "\n";
+        # It hasn't, so write the old macro text
+        print MACROFILE_TMP $2 . "\n";
+        $curroutline++;
+        }
+
+        # Chew up the old macro text, spitting it out if necessary
+        while ($_ !~ /.*\}/) {
+        $_ = <MACROFILE_IN>;
+        # $currline++;
+        if ($newsubmission ne "true") {
+            print MACROFILE_TMP $_;
+            $curroutline++;
+        }
+        }
+
+        # Remember where this macro finished
+        $currpackageinsertionpoint = $curroutline;
+    }
+
+    # The line must just be a comment or whitespace
+    else {
+        print MACROFILE_TMP $_;
+        $curroutline++;
+    }
+    }
+
+    # Close opened files
+    close MACROFILE_TMP;
+    close MACROFILE_IN;
+
+    open(MACROFILE_TMP, "<$macrofile.tmp") or die "Error: Could not open $macrofile.tmp\n";
+    # open(MACROFILE_OUT, ">$macrofile.out") or die "Error: Could not write $macrofile.out\n";
+    open(MACROFILE_OUT, ">$macropath") or die "Error: Could not write $macropath\n";
+
+    # Insert the new macro submissions in the correct place
+    $currline = 0;
+    while (<MACROFILE_TMP>) {
+    $currline++;
+
+    # Are we at a package insertion point?
+    if ($insertionpoints{$currline}) {
+        $currpackage = $insertionpoints{$currline};
+
+        # Yes, so check if there are any macros to insert here
+        foreach $key (keys %$submissions) {
+        $key =~ m/^[^:]+::([^:]+)::(.*)/;
+        my $packagename = $1;
+        my $macroname = $2;
+
+        if ($packagename eq $currpackage) {
+            # Insert this macro here
+            &write_macro_to_file($macroname, $submissions->{$key}, MACROFILE_OUT);
+            delete $submissions->{$key};
+        }
+        }
+    }
+
+    print MACROFILE_OUT $_;
+    }
+
+    # If there are any submissions still remaining, write them to a new package at the end
+    $currpackage = "";
+    foreach $key (sort (keys %$submissions)) {
+    $key =~ m/^[^:]+::([^:]+)::(.*)/;
+    my $packagename = $1;
+    my $macroname = $2;
+
+    if ($packagename ne $currpackage) {
+        # Write package header
+        print MACROFILE_OUT "\n";
+        print MACROFILE_OUT "########################################################\n";
+        print MACROFILE_OUT "package $packagename\n";
+        print MACROFILE_OUT "########################################################\n";
+
+        $currpackage = $packagename;
+    }
+
+    # Write macro
+    &write_macro_to_file($macroname, $submissions->{$key}, MACROFILE_OUT);
+    delete $submissions->{$key};
+    }
+
+    # Close opened files
+    close MACROFILE_OUT;
+    close MACROFILE_TMP;
+
+    # Delete the temporary file
+    unlink("$macrofile.tmp");
+}
+
+
+sub write_macro_to_file
+{
+    my ($macroname, $macrotext, $filehandle) = @_;
+
+    print MACROFILE_OUT "\n";
+    print MACROFILE_OUT "# Macro added using the translation agency\n";
+
+    if ($macrotext =~ m/\#\# (^|.)*/) {
+    # Icon macro
+    print MACROFILE_OUT $macrotext;
+    }
+    else {
+    # Text macro
+    print MACROFILE_OUT $macroname . $macrotext;
     }
 }