Changeset 3065 for trunk

Timestamp:

Jan 9, 2009, 12:33:35 AM (15 years ago)

Author:

plg

Message:

merge r3064 from branch 2.0 to trunk

bug 912 fixed: we need an extra original_sum to pwg.images.add API method to
check photo existence. Using the file_sum was a bad idea.

Location:

trunk

Files:

• include/ws_functions.inc.php (modified) (2 diffs)
• tools/piwigo_remote.pl (modified) (4 diffs)
• ws.php (modified) (1 diff)

trunk/include/ws_functions.inc.php

@@ -910 +910 @@
     COUNT(*) AS counter
   FROM '.IMAGES_TABLE.'
-  WHERE md5sum = \''.$params['file_sum'].'\'
+  WHERE md5sum = \''.$params['original_sum'].'\'
 ;';
   list($counter) = mysql_fetch_row(pwg_query($query));
@@ -1089 +1089 @@
     'width' => $width,
     'height' => $height,
-    'md5sum' => $params['file_sum'],
+    'md5sum' => $params['original_sum'],
     );
 

trunk/tools/piwigo_remote.pl

@@ -12 +12 @@
 GetOptions(
     \%opt,
-    qw/action=s file=s thumbnail=s high=s categories=s define=s%/
+    qw/action=s file=s thumbnail=s high=s original=s categories=s define=s%/
 );
 
@@ -49 +49 @@
     use File::Slurp;
 
+    my $original_sum = file_md5_hex($opt{original});
+
     my $file_content = encode_base64(read_file($opt{file}));
     my $file_sum = file_md5_hex($opt{file});
@@ -57 +59 @@
     $form = {
         method => 'pwg.images.add',
+        original_sum => $original_sum,
         file_sum => $file_sum,
         file_content => $file_content,
@@ -85 +88 @@
 
 #     use Data::Dumper;
-#     print Dumper($response);
+#     print Dumper($response->content);
+#     print Dumper(from_json($response->content));
 
     if ($response->is_success) {

trunk/ws.php

@@ -183 +183 @@
       'high_content' => array('default' => null),
       'high_sum' => array('default' => null),
+      'original_sum' => array(),
       'name' => array('default' => null),
       'author' => array('default' => null),