log requests to get a simple history, UB-Mannheim#21

js: make cgiUrl configurable request logging: expose via action=history
kba · May 4, 2016 · b359fdf · b359fdf
1 parent e9d34fa
commit b359fdf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/dist/fonts/ebgaramond-3518839e8896cacde0037ae0655a97d7c4832ed2.eot b/dist/fonts/ebgaramond-3518839e8896cacde0037ae0655a97d7c4832ed2.eot
diff --git a/dist/js/ocr-gt-tools.js b/dist/js/ocr-gt-tools.js
@@ -3,7 +3,10 @@
 var UISettings = {
     zoomInFactor: 1.4,
     zoomOutFactor: 0.8,
+    cgiUrl: 'ocr-gt-tools.cgi'
 };
+console.log(UISettings.cgiUrl);
+console.log(UISettings.cgiUrl + '?action=save');
 
 var Utils = {};
 
@@ -87,7 +90,7 @@ function loadGtEditLocation(url) {
 
     $.ajax({
         type: 'POST',
-        url: 'ocr-gt-tools.cgi?action=create',
+        url: UISettings.cgiUrl + '?action=create',
         data: {'data_url': url},
         beforeSend: function(xhr) {
             // to instantly see when a new document has been retrieved
@@ -171,7 +174,7 @@ function saveGtEditLocation() {
 
     $.ajax({
         type: 'post',
-        url: 'ocr-gt-tools.cgi?action=save',
+        url: UISettings.cgiUrl + '?action=save',
         data: window.ocrGtLocation,
         success: function() {
             // after #file_correction is saved

diff --git a/ocr-gt-tools.cgi b/ocr-gt-tools.cgi
@@ -4,8 +4,8 @@ use warnings;
 my $OCR_GT_BASEDIR;
 my $ERRORLOG;
 my $REQUESTLOG;
-# my $DATE_FORMAT = "%Y-%m-%d %H:%M:%S";
-my $DATE_FORMAT = "%H:%M:%S";
+my $DATE_FORMAT = "%Y-%m-%d";
+my $TIME_FORMAT = "%H:%M:%S";
 
 use Data::Dumper;
 use JSON;
@@ -46,7 +46,7 @@ sub debug
 {
     my $msg = sprintf(shift(), @_);
     my $t = time;
-    my $timestamp = strftime $DATE_FORMAT, localtime $t;
+    my $timestamp = strftime $TIME_FORMAT, localtime $t;
     $timestamp .= sprintf ".%03d", ($t-int($t))*1000; # without rounding
     printf $ERRORLOG "%s: %s\n", $timestamp, $msg;
 }
@@ -64,8 +64,12 @@ sub logRequest
     if (!$url) {
         $url = $cgi->param('imageUrl');
     }
+    if (!$url) {
+        debug("No URL to log for this request");
+        return;
+    }
     my $t = time;
-    my $timestamp = strftime $DATE_FORMAT, localtime $t;
+    my $timestamp = strftime "$DATE_FORMAT $TIME_FORMAT", localtime $t;
     printf $REQUESTLOG "%s;%s;%s\n", $timestamp, $ENV{REMOTE_ADDR}, $url;
 }
 
@@ -436,6 +440,8 @@ sub processRequest
         processCreateRequest($cgi, $config);
     } elsif ($action eq 'save') {
         processSaveRequest($cgi, $config);
+    } elsif ($action eq 'history') {
+        processHistoryRequest($cgi, $config);
     } else {
         http400($cgi, "URL parameter 'action' must be 'create' or 'save', not %s", $action);
     }
@@ -480,6 +486,16 @@ sub processSaveRequest
     saveComments($cgi, $config, $location->{commentsTxt}, $pageComment, $lineComments);
     return httpJSON($cgi, { result => 1 });
 }
+sub processHistoryRequest
+{
+    my ($cgi, $config) = @_;
+    open my $RL, "<", "$OCR_GT_BASEDIR/log/request.log";
+    my @lines;
+    while (<$RL>) {
+        push @lines, [split(/;/, $_)];
+    }
+    return httpJSON($cgi, \@lines);
+}
 
 debugStandout('START REQUEST');
 my $cgi = CGI->new;