Changeset 6919 for extensions/AMetaData

Timestamp:

Sep 14, 2010, 7:14:43 PM (14 years ago)

Author:

grum

Message:

Implement basic/advanced modes, release 0.5.1
bug:1857

Location:

extensions/AMetaData

Files:

• admin/amd_install_page.tpl (added)
• admin/amd_metadata_display.tpl (modified) (3 diffs)
• admin/plugin_admin.php (modified) (2 diffs)
• amd_aip.class.inc.php (modified) (5 diffs)
• amd_aip_install.class.inc.php (added)
• amd_ajax.php (modified) (2 diffs)
• amd_install.class.inc.php (modified) (4 diffs)
• amd_root.class.inc.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)

extensions/AMetaData/admin/amd_metadata_display.tpl

@@ -153 +153 @@
         {
           resizable: true,
-          width:480,
+          width:640,
           height:120,
           modal: true,
@@ -212 +212 @@
       {
         resizable: true,
-        width:480,
+        width:640,
         height:120,
         modal: true,
@@ -280 +280 @@
       {
         resizable: false,
-        width:480,
-        height:320,
+        width:640,
+        height:480,
         modal: true,
         draggable:true,

extensions/AMetaData/admin/plugin_admin.php

@@ -20 +20 @@
 if (!defined('PHPWG_ROOT_PATH')) { die('Hacking attempt!'); }
 
-include(AMD_PATH."amd_aip.class.inc.php");
-
 global $prefixeTable;
 
@@ -28 +26 @@
 $main_plugin_object = get_plugin_data($plugin_id);
 
-$plugin_ai = new AMD_AIP($prefixeTable, $main_plugin_object->getFileLocation());
+/*
+ * if the plugin is newly installed, display a special configuration page
+ * otherwise, display normal page
+ */
+
+$config=Array();
+GPCCore::loadConfig('amd', $config);
+
+if($config['newInstall']=='n')
+{
+  include(AMD_PATH."amd_aip.class.inc.php");
+  $plugin_ai = new AMD_AIP($prefixeTable, $main_plugin_object->getFileLocation());}
+else
+{
+  include(AMD_PATH."amd_aip_install.class.inc.php");
+  $plugin_ai = new AMD_AIPInstall($prefixeTable, $main_plugin_object->getFileLocation());
+}
+
 $plugin_ai->manage();
 

extensions/AMetaData/amd_aip.class.inc.php

@@ -48 +48 @@
 
     $this->tabsheet = new tabsheet();
-    $this->tabsheet->add('database',
-                          l10n('g003_database'),
-                          $this->getAdminLink().'&fAMD_tabsheet=database');
-    $this->tabsheet->add('metadata',
-                          l10n('g003_metadata'),
-                          $this->getAdminLink().'&fAMD_tabsheet=metadata');
-    $this->tabsheet->add('search',
-                          l10n('g003_search'),
-                          $this->getAdminLink().'&fAMD_tabsheet=search');
-    $this->tabsheet->add('help',
-                          l10n('g003_help'),
-                          $this->getAdminLink().'&fAMD_tabsheet=help');
+
+    if($this->config['amd_interfaceMode']=='basic')
+    {
+      $this->tabsheet->add('metadata',
+                            l10n('g003_metadata'),
+                            $this->getAdminLink().'&fAMD_tabsheet=metadata');
+      $this->tabsheet->add('help',
+                            l10n('g003_help'),
+                            $this->getAdminLink().'&fAMD_tabsheet=help');
+    }
+    else
+    {
+      $this->tabsheet->add('database',
+                            l10n('g003_database'),
+                            $this->getAdminLink().'&fAMD_tabsheet=database');
+      $this->tabsheet->add('metadata',
+                            l10n('g003_metadata'),
+                            $this->getAdminLink().'&fAMD_tabsheet=metadata');
+      $this->tabsheet->add('search',
+                            l10n('g003_search'),
+                            $this->getAdminLink().'&fAMD_tabsheet=search');
+      $this->tabsheet->add('help',
+                            l10n('g003_help'),
+                            $this->getAdminLink().'&fAMD_tabsheet=help');
+    }
   }
 
@@ -155 +168 @@
     if(!isset($_REQUEST['fAMD_tabsheet']))
     {
-      if($this->getNumOfPictures()==0)
+      if($this->getNumOfPictures()==0 and $this->config['amd_interfaceMode']=='advanced')
       {
         $_REQUEST['fAMD_tabsheet']="database";
@@ -168 +181 @@
 
     if(!($_REQUEST['fAMD_tabsheet']=="metadata" or
-         $_REQUEST['fAMD_tabsheet']!="help" or
-         $_REQUEST['fAMD_tabsheet']!="database" or
-         $_REQUEST['fAMD_tabsheet']!="search"))
+         $_REQUEST['fAMD_tabsheet']=="help" or
+         $_REQUEST['fAMD_tabsheet']=="database" or
+         $_REQUEST['fAMD_tabsheet']=="search")
+         or
+         $this->config['amd_interfaceMode']=='basic' and
+         (
+           $_REQUEST['fAMD_tabsheet']=="database" or
+           $_REQUEST['fAMD_tabsheet']=="search"
+         )
+      )
     {
       $_REQUEST['fAMD_tabsheet']="metadata";
@@ -180 +200 @@
     if($_REQUEST['fAMD_tabsheet']=="metadata")
     {
-      if(!isset($_REQUEST['fAMD_page'])) $_REQUEST['fAMD_page']="select";
+      if(!isset($_REQUEST['fAMD_page']))
+      {
+        if($this->config['amd_interfaceMode']=='basic')
+        {
+          $_REQUEST['fAMD_page']="display";
+        }
+        else
+        {
+          $_REQUEST['fAMD_page']="select";
+        }
+      }
 
       if(!($_REQUEST['fAMD_page']=="personnal" or
            $_REQUEST['fAMD_page']=="select" or
-           $_REQUEST['fAMD_page']=="display")) $_REQUEST['fAMD_page']="select";
+           $_REQUEST['fAMD_page']=="display")
+           or
+           $this->config['amd_interfaceMode']=='basic' and
+           (
+             $_REQUEST['fAMD_page']=="select"
+           )
+        )
+      {
+        if($this->config['amd_interfaceMode']=='basic')
+        {
+          $_REQUEST['fAMD_page']="display";
+        }
+        else
+        {
+          $_REQUEST['fAMD_page']="select";
+        }
+      }
     }
 
@@ -281 +327 @@
                           l10n('g003_personnal'),
                           $this->getAdminLink().'&fAMD_tabsheet=metadata&fAMD_page=personnal');
-    $statTabsheet->add('select',
-                          l10n('g003_select'),
-                          $this->getAdminLink().'&fAMD_tabsheet=metadata&fAMD_page=select');
+    if($this->config['amd_interfaceMode']=='advanced')
+    {
+      $statTabsheet->add('select',
+                            l10n('g003_select'),
+                            $this->getAdminLink().'&fAMD_tabsheet=metadata&fAMD_page=select');
+    }
     $statTabsheet->add('display',
                           l10n('g003_display'),

extensions/AMetaData/amd_ajax.php

@@ -318 +318 @@
 
 
+
+
         /*
          * check public.makeStats.doPictureAnalyze values
@@ -1495 +1497 @@
 
 
-
   } //class
 

extensions/AMetaData/amd_install.class.inc.php

@@ -50 +50 @@
       $this->loadConfig();
       $this->config['installed']=AMD_VERSION2;
+      $this->config['newInstall']='y';
       $this->saveConfig();
 
@@ -121 +122 @@
       unset($tables_def);
 
-      $tables_insert=array(
+
+      $tablesInsert=array(
 "INSERT INTO `".$this->tables['groups']."` VALUES(1, 0)",
 "INSERT INTO `".$this->tables['groups_names']."` VALUES(1, '".$user['language']."', '".$lang['g003_default_group_name']."')",
@@ -135 +137 @@
     ('magic.ShotInfo.Flash.Fired', 8, 1)"
       );
-      foreach($tables_insert as $sql)
+      foreach($tablesInsert as $sql)
       {
         pwg_query($sql);
       }
+
 
       return($result);
@@ -279 +282 @@
         pwg_query($sql);
       }
-
-      $listToAnalyze=Array(Array(), Array());
-      /*
-       * select 25 pictures into the caddie
-       */
-      $sql="SELECT ti.id, ti.path
-            FROM ".CADDIE_TABLE." tc
-              LEFT JOIN ".IMAGES_TABLE." ti ON ti.id = tc.element_id
-            WHERE tc.user_id = ".$user['id']."
-              AND ti.id IS NOT NULL
-            ORDER BY RAND() LIMIT 25;";
-      $result=pwg_query($sql);
-      if($result)
-      {
-        while($row=pwg_db_fetch_assoc($result))
-        {
-          $listToAnalyze[0][]=$row;
-          $listToAnalyze[1][]=$row['id'];
-        }
-      }
-      /*
-       * if caddie is empty, of is have less than 25 pictures, select other
-       * pictures from the gallery
-       */
-      if(count($listToAnalyze[0])<25)
-      {
-        if(count($listToAnalyze[0])>0)
-        {
-          $excludeList="WHERE ti.id NOT IN(".implode(",", $listToAnalyze[1]).") ";
-        }
-        else
-        {
-          $excludeList="";
-        }
-        $sql="SELECT ti.id, ti.path, ti.has_high
-              FROM ".IMAGES_TABLE." ti ".$excludeList."
-              ORDER BY RAND() LIMIT ".(25-count($listToAnalyze[0])).";";
-        $result=pwg_query($sql);
-        if($result)
-        {
-          while($row=pwg_db_fetch_assoc($result))
-          {
-            $listToAnalyze[0][]=$row;
-          }
-        }
-      }
-
-      /*
-       * analyze the 25 selected pictures
-       */
-      if(count($listToAnalyze[0])>0)
-      {
-        // $path = path of piwigo's on the server filesystem
-        $path=dirname(dirname(dirname(__FILE__)));
-
-        foreach($listToAnalyze[0] as $val)
-        {
-          if($val['has_high']===true and $this->config['amd_UseMetaFromHD']=='y')
-          {
-            $this->analyzeImageFile($path."/".dirname($val['path'])."/pwg_high/".basename($val['path']), $val['id']);
-          }
-          else
-          {
-            $this->analyzeImageFile($path."/".$val['path'], $val['id']);
-          }
-
-        }
-
-        $this->makeStatsConsolidation();
-      }
     }
 

extensions/AMetaData/amd_root.class.inc.php

@@ -87 +87 @@
       'amd_FillDataBaseIgnoreSchemas' => array(),
       'amd_UseMetaFromHD' => "y",
+      'amd_InterfaceMode' => "advanced",    // 'advanced' or 'basic'
 
       // theses options can be set manually

extensions/AMetaData/language/fr_FR/plugin.lang.php

@@ -163 +163 @@
 [/ul]";
 
-/*
- * release 0.5.0
+
+
+/** ----------------------------------------------------------------------------
+ * new keys from releases 0.5.0/0.5.1
  */
 
 $lang['g003_y'] = "Oui";
 $lang['g003_n'] = "Non";
-
 
 $lang['g003_state'] = "Etat";
@@ -265 +266 @@
 $lang['g003_please_set_a_value'] = "Merci de définir une valeur";
 
-/*
- * removed keys
+
+$lang['g003_install']="Installation";
+$lang['g003_basic_mode']="Basique";
+$lang['g003_advanced_mode']="Avancé";
+$lang['g003_validate']="Valider";
+$lang['g003_step_1']="Choix du type d'usage du plugin";
+$lang['g003_basic_mode_help']="
+Le mode [i]basique[/i] s'adresse à ceux qui souhaitent simplement afficher les métadonnées de leurs photos et propose :[ul]
+[li]une interface simplifiée au maximum[/li]
+[li]une liste réduite de métadonnées (environ 140, dont les plus courantes)[/li]
+[/ul]";
+$lang['g003_advanced_mode_help']="
+Le mode [i]avancé[/i] s'adresse à ceux qui souhaitent exploiter au maximum les métadonnées de leurs photos et propose :[ul]
+[li]une interface plus complexe, mais complète[/li]
+[li]une liste de métadonnées plus complète (environ 540)[/li]
+[li]des fonctionnalités étendues (statistiques, recherche, ...)[/li]
+[/ul]
+Le mode [i]avancé[/i] nécessite la constitution d'un référentiel.";
+
+
+/** ----------------------------------------------------------------------------
+ * removed keys from releases 0.5.0/0.5.1
  */
 //$lang['g003_warning_on_analyze_4a']

extensions/AMetaData/main.inc.php

@@ -67 +67 @@
 |         |            | * mantis : feature 1846
 |         |            |   . Read the metadata in the HD picture
+|         |            | * mantis : feature 1857
+|         |            |   . Implement a basic and an advanced interface mode
 |         |            | * ajax management entirely rewritted
 |         |            | * user interface reviewed