Changeset 1366

Timestamp:

Sep 12, 2010, 2:44:04 AM (10 years ago)

Author:

teymour

Message:

Intégration de TextLoi? dans Solr

Location:

cpc/trunk/project

Files:

• config/doctrine/schema.yml (modified) (2 diffs)
• lib/model/doctrine/Texteloi.class.php (modified) (2 diffs)
• lib/model/solr/SolrCommands.class.php (modified) (1 diff)
• lib/model/solr/SolrConnector.class.php (modified) (1 diff)
• lib/task/loadDocumentsTask.class.php (modified) (2 diffs)

cpc/trunk/project/config/doctrine/schema.yml

@@ -569 +569 @@
     Timestampable: ~
     Taggable: ~
+    Solrable:
+      title: [titre]
+      description: [contenu, annexe, signataires]
+      moretags: [Parlementaires, categorie, type, Organisme]
+      date: date
   columns:
     id:
@@ -589 +594 @@
     organisme_id: integer
     signataires: string
+    contenu: string
   relations:
     Parlementaires:

cpc/trunk/project/lib/model/doctrine/Texteloi.class.php

@@ -168 +168 @@
   }
 
+
   public function getAuteursString() {
     if ($this->type === "Texte de la commission")
@@ -201 +202 @@
     return $str;
   }
+
+  public function getContenu() {
+    $c = $this->_get('contenu');
+    return gzinflate(base64_decode($c));
+  }
+
+  public function setContenu($c) {
+    return $this->_set('contenu', base64_encode(gzdeflate($c)));
+  }
+
+  public function getLink() {
+    sfProjectConfiguration::getActive()->loadHelpers(array('Url'));
+    return url_for('@homepage');
+  }
+
+  public function getPersonne() {
+    return '';
+  }
 }

cpc/trunk/project/lib/model/solr/SolrCommands.class.php

@@ -44 +44 @@
     }
     sem_acquire($this->semaphore);
-    if (!$this->file) {
-      touch($lockfile);
-      sem_release($this->semaphore);
-      return $lockfile;
+    if ($this->file) {
+      fclose($this->file);
+      $this->file = null;
     }
-    fclose($this->file);
-    $this->file = null;
-    rename($this->getFileCommands(), $this->getFileCommands().'.lock');
+    rename($this->getFileCommands(), $lockfile);
     sem_release($this->semaphore);
     return $lockfile;

cpc/trunk/project/lib/model/solr/SolrConnector.class.php

@@ -31 +31 @@
     $file = SolrCommands::getInstance()->getCommandContent();
     foreach(file($file) as $line) {
+      echo "$line\n";
       if (preg_match('/(UPDATE|DELETE) : (.+)/', $line, $matches)) {
         $obj = json_decode($matches[2]);

cpc/trunk/project/lib/task/loadDocumentsTask.class.php

@@ -21 +21 @@
           foreach(file($dir.$file) as $line) {
             $json = json_decode($line);
-            if (!$json || !$json->source || !$json->legislature || !$json->id || !$json->numero || !$json->date_depot || !$json->dossier || !$json->type) {
-              echo "ERROR json : $line\n";
+            if (!$json )
+            {
+              echo "ERROR json : $dir$file\n";
               continue;
             }
+            if (!$json->source)
+              {echo "source missing\n"; continue;}
+            if (!$json->legislature)
+              {echo "legislature missing\n"; continue;}
+            if (!$json->id)
+              {echo "source id\n"; continue;}
+            if (!$json->numero)
+              {echo "source numero\n"; continue;}
+            if(!$json->date_depot)
+              {echo "source date_depot\n"; continue;}
+            if (!$json->dossier)
+              {echo "source dossier\n"; continue;}
+            if (!$json->type)
+              {echo "source type\n"; continue;}
             $doc = Doctrine::getTable('TexteLoi')->find($json->id);
             if (!$doc) {
@@ -52 +67 @@
               foreach (explode('.', $json->motscles) as $tag)
                 $doc->addTag($tag);
+            if ($json->contenu)
+              $doc->setContenu($json->contenu);
             $doc->save();
             $doc->free();
+            echo "$dir$file DONE\n";
           }
-          unlink($dir.$file);
+          //      unlink($dir.$file);
         }
         closedir($dh);