Changeset 10027

Timestamp:

2005-06-08T14:03:53+12:00 (19 years ago)

Author:

mdewsnip

Message:

Completed GTI searching and correcting functionality.

Location:

trunk/gsdl

Files:

• bin/script/gti.pl (modified) (3 diffs)
• src/recpt/gtiaction.cpp (modified) (5 diffs)
• src/recpt/gtiaction.h (modified) (1 diff)

trunk/gsdl/bin/script/gti.pl

@@ -386 +386 @@
     # The key of the file to translate (ensure it is lowercase)
     my $translation_file_key = lc(shift(@_));
+    # Whether to submit a target chunk even if it hasn't changed
+    my $force_submission_flag = shift(@_);
 
     # Check that the necessary arguments were supplied
@@ -489 +491 @@
         next;
     }
-
-    # Apply the submitted translations
-    if (defined($target_file_key_to_submission_mapping{$chunk_key})) {
-        $target_file_key_to_text_mapping{$chunk_key} = $target_file_key_to_submission_mapping{$chunk_key};
+    }
+
+    # Apply the submitted translations
+    foreach my $chunk_key (keys(%target_file_key_to_submission_mapping)) {
+    if ($force_submission_flag || $target_file_key_to_submission_mapping{$chunk_key} ne $target_file_key_to_text_mapping{$chunk_key}) {
+        $target_file_key_to_text_mapping{$chunk_key} = $target_file_key_to_submission_mapping{$chunk_key};
         $target_file_key_to_comment_date_mapping{$chunk_key} = $submission_date;
-    }
+    }
     }
 
@@ -845 +849 @@
         $i++;
         $line = $file_lines[$i];
-        $line =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
+        $line =~ s/\s*([^\\]\#.+)?$//;  # Remove any comments and nasty whitespace
         }
 

trunk/gsdl/src/recpt/gtiaction.cpp

@@ -181 +181 @@
   }
 
-  // Process a user submission
+  // Process user translations
   if (args["p"] == "submit") {
-    process_gti_submission(disp, args, logout);
+    process_gti_submissions(disp, args, logout, true);
   }
 
@@ -270 +270 @@
   text_t translation_file_key = args["tfk"];
   text_t query_string = to_utf8(args["q"]);
+
+  // Process user corrections
+  if (args["sp"] != "") {
+    process_gti_submissions(disp, args, logout, false);
+  }
 
   disp.setmacro("gtiformcontent", "gti", "_gti:gtifind_");
@@ -318 +323 @@
     chunk_key_iterator++;
   }
+  gti_find_form_content += "_gtifindformfooter_\n";
 
   disp.setmacro("gtifindformcontent", "gti", gti_find_form_content);
@@ -402 +408 @@
 
 
-void gtiaction::process_gti_submission(displayclass& disp, cgiargsclass &args, ostream& logout)
+void gtiaction::process_gti_submissions(displayclass& disp, cgiargsclass &args, ostream& logout, bool force_submission)
 {
   // Get the target language code and file to translate from the CGI arguments
@@ -442 +448 @@
   // Send the submission to gti.pl
   text_t gti_arguments = "submit-translation " + target_language_code + " " + translation_file_key;
+  if (force_submission) {
+    gti_arguments += " -force_submission";
+  }
   do_gti_submission(gti_arguments, submission_text, logout);
   logout << "Done." << endl;

trunk/gsdl/src/recpt/gtiaction.h

@@ -107 +107 @@
   text_t escape_all(text_t source_string, char character_to_escape);
 
-  void process_gti_submission(displayclass& disp, cgiargsclass& args, ostream& logout);
+  void process_gti_submissions(displayclass& disp, cgiargsclass& args, ostream& logout, bool force_submission);
 
   GTI_Response do_gti_request(text_t, ostream&);