Conjunto ef72343 en sipes

Fecha y hora:

26/09/2018 09:10:05 (hace 6 años)

Autor:

jpuentes <jpuentes@…>

Branches:

stable

Children:

f8d6cf8

Parents:

a585534

Mensaje:

Se modifico la estructura para que no se importe el contenido en el termino incorrecto cuando se presenta el caso de padres repetidos.

Fichero:

• 0.3-modules/ente_planificador_importar/ente_planificador_importar.module (modificado) (2 diferencias)

0.3-modules/ente_planificador_importar/ente_planificador_importar.module

@@ -822 +822 @@
             if ($form_state['values']['search_parent_' . $j] && $data[$form_state['values']['search_parent_' . $j] - 1]) {
               $term['search_parent'] = check_plain($data[$form_state['values']['search_parent_' . $j] - 1]);
+              $term['term_parent'] = check_plain($data[$form_state['values']['search_parent_0']]);
             }
             if (!($form_state['values']['encabezado'] && $i == 1)) {
@@ -897 +898 @@
  */
 function _batch_ente_planificador_importar_term($term, &$context) {
-   //not create if exist
-  $db_result = db_query(db_rewrite_sql("SELECT t.tid, t.name FROM {term_data} t WHERE LOWER(t.name) = LOWER('%s') AND vid = %d", 't', 'tid'), $term['name'], $term['vid']);
-  $row = db_fetch_array($db_result);
-  if (!taxonomy_get_term($row['tid'])) {
-   $term['parent'] = array();
-   $term['search_parent'];
-   if ($term['search_parent']) {
-     $db_result = db_query(db_rewrite_sql("SELECT MAX(t.tid) FROM {term_data} t WHERE LOWER(t.name) = LOWER('%s') AND vid = %d", 't', 'tid'), trim($term['search_parent']), $term['vid']);
-     $result = array();
-     $row = db_fetch_array($db_result);
-     if (!empty($row)) {
-       $parent = taxonomy_get_term($row['tid']);
-       if ($parent) {
-         $term['parent'][] = $parent->tid;
-        }
-      }
-    }
-    taxonomy_save_term($term);
-  }
+  //not create if exist
+  if ($term['search_parent']) {
+    $db_result = db_query(db_rewrite_sql("SELECT t.tid, t.name FROM {term_data} t WHERE LOWER(t.name) = LOWER('%s') AND vid = %d", 't', 'tid'), trim($term['search_parent']), $term['vid']);
+    $result = array();
+    while ($row = db_fetch_array($db_result)) {
+      if (!empty($row)) {
+        $parents_all = taxonomy_get_parents_all($row['tid']);
+        foreach ($parents_all as $parent) {
+          if ($parent->name == trim($term['search_parent']) && $parents_all[count($parents_all) - 1]->name == trim($term['term_parent'])) {
+            $parents = array('name' => $parent->name, 'tid_parent' => $row['tid']);
+               
+            $db_query2 = db_query(db_rewrite_sql("SELECT t.tid, t.name FROM {term_data} t inner join {term_hierarchy} as h on h.tid=t.tid WHERE LOWER(t.name) = LOWER('%s') AND t.vid = %d AND h.parent = %d", 't', 'tid'), trim($term['name']), $term['vid'], $row['tid']);
+            $rows_query = db_fetch_array($db_query2);
+            if (!$rows_query['tid']) {
+              $term['parent'][] = $parents['tid_parent'];
+              taxonomy_save_term($term);
+             }
+           }
+         }
+       }
+     }
+   }
+   else {
+     $db_result = db_query(db_rewrite_sql("SELECT t.tid, t.name FROM {term_data} t INNER JOIN {term_hierarchy} as h ON h.tid=t.tid WHERE LOWER(t.name) = LOWER('%s') AND t.vid = %d AND h.parent = %d", 't', 'tid'), trim($term['name']), $term['vid'], 0);
+     $rows = db_fetch_array($db_result);
+
+     if (!taxonomy_get_term($rows['tid'])) {
+       taxonomy_save_term($term);
+     }
+   }
 
   $context['message'] = t('Now processing ente: %submission', array('%submission' => $term->name));
   $context['results'][] = 'term importado: ' . $term->name . '</pre>';
-/*
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-    $context['finished'] = 1;
-  } else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
-*/
 }