Changeset 31609 in spip-zone

Timestamp:

Sep 16, 2009, 10:02:47 AM (11 years ago)

Author:

apachot@…

Message:

• début de recherche avancée multichamps
• début d'identification dans pmb depuis spip

Location:

_plugins_/spip-pmb/2_0_0

Files:

• action (added)
• formulaires/recherche.html (modified) (2 diffs)
• inc-entete.html (modified) (2 diffs)
• inc-head.html (modified) (1 diff)
• inc-recherche-catalogue.html (modified) (1 diff)
• pmb_mes_fonctions.php (modified) (2 diffs)
• recherche.html (modified) (1 diff)

_plugins_/spip-pmb/2_0_0/formulaires/recherche.html

@@ -8 +8 @@
                 <span><input type='checkbox' name='look_SITE' id='look_SITE' value='1'  /><label for='look_SITE'> <:recherche_portail_web:> </label></span>
                 </div>
+                <input type="hidden" id="look_ALL" name="look_ALL" value="1" />
                 <div class="champ-recherche">
                         <label for="recherche"><:info_rechercher_02:></label>
@@ -14 +15 @@
                 </div>
                 <div class="recherche-avancee">
-                        <a href="#CONFIG{spip_pmb/url}"><:recherche_avancee:> +</a>
+                        <a href="[(#URL_PAGE{recherche})&look_ALL=1]"><:recherche_avancee:> +</a>
                 </div>
                 <br class="nettoyeur" />

_plugins_/spip-pmb/2_0_0/inc-entete.html

@@ +1 @@
+#CACHE{0}
 <div id="top">
 
         <a rel="start" href="#URL_SITE_SPIP/">[(#LOGO_SITE_SPIP||image_reduire{500,100}|inserer_attribut{alt,#NOM_SITE_SPIP}|inserer_attribut{title,#NOM_SITE_SPIP}) ]<span id="nom_site_spip">[(#NOM_SITE_SPIP)]</span></a>
 
-[<div class="formulaire_spip formulaire_moncomptepmb">
+<div class="formulaire_spip formulaire_moncomptepmb">
 <h2><:pmb:mon_compte:></h2>
-<form name="myform" method="post" target="_blank" action="(#CONFIG{spip_pmb/url})empr.php">
+<form name="myform" method="post" action="#SELF">
 <fieldset>
 <legend><:pmb:mon_compte:></legend>
+<input type="hidden" name="action" value="connexion_pmb" />
+<input type="hidden" name="redirect" value="#SELF" />
 <ul>
 <li>
@@ -26 +29 @@
 </form>
 
-</div>]
+</div>
 <div class="fonctionnement"><:pmb:comment_ca_fonctionne:></div>
 

_plugins_/spip-pmb/2_0_0/inc-head.html

@@ -55 +55 @@
 </script> 
 
-
-<script type='text/javascript'>
-        $(document).ready(function(){
-                $('.formulaire_moncomptepmb form').bind('submit', function(){
-                alert("<:pmb:message_compte_lecteur:>");
-                return true;    
-                });
-                $('.recherche-avancee a').bind('click', function(){
-                alert("<:pmb:message_recherche_avancee:>");
-                return true;    
-                });
-        });
-</script>
-
 [(#REM) Agreger et compacter tout cela dans des fichiers statiques ]
 #FILTRE{compacte_head}

_plugins_/spip-pmb/2_0_0/inc-recherche-catalogue.html

@@ -4 +4 @@
 <a id="resultats_recherche"></a>
                         
-                <div class="menu articles">
+                <div class="menu articles surlignable">
                         <B_tab_resultat>
                         

_plugins_/spip-pmb/2_0_0/pmb_mes_fonctions.php

@@ -172 +172 @@
 function pmb_recherche_extraire($recherche, $url_base, $look_FIRSTACCESS='', $look_ALL='', $look_AUTHOR='', $look_PUBLISHER='', $look_COLLECTION='', $look_SUBCOLLECTION='', $look_CATEGORY='', $look_INDEXINT='', $look_KEYWORDS='', $look_TITLE='', $look_ABSTRACT='', $surligne='', $typdoc='', $ok='',$mode='auto') {
         $tableau_resultat = Array();
-        //$url_page = "index.php?lvl=search_result";
         if ($surligne) $url_page.="&surligne=".$surligne;
         if ($typdoc) $url_page.="&typdoc=".$typdoc;
         if ($ok) $url_page.="&ok=".$ok;
 
-        /*0 (SEARCH_ALL)=tous les champs,
-        1 (SEARCH_TITLE)=titre,
-        2 (SEARCH_AUTHOR)=auteur,
-        3 (SEARCH_EDITOR)=éditeur,
-        4 (SEARCH_COLLECTION)=collection,
-        6 (SEARCH_CATEGORIES)=catégories/mots matières
-        */
-        $searchType = 0; //par défaut recherche sur tous les champs
-        if ($look_ALL) $searchType = 0;
-        if ($look_TITLE) $searchType = 1;
+        
+        $search = array();
+        
+                        
+        if ($look_ALL) $search[] = array("inter"=>"or","field"=>42,"operator"=>"BOOLEAN", "value"=>$recherche); 
+        if ($look_TITLE) $search[] = array("inter"=>"or","field"=>1,"operator"=>"BOOLEAN", "value"=>$recherche);
         //if ($look_FIRSTACCESS) $url_page.="&look_FIRSTACCESS=".$look_FIRSTACCESS;
-        if ($look_AUTHOR)  $searchType = 2;
-        if ($look_PUBLISHER) $searchType = 3;
-        if ($look_COLLECTION) $searchType = 4;
-        if ($look_ABSTRACT) $searchType = 5;
-        if ($look_CATEGORY) $searchType = 6;
-        /*if ($look_INDEXINT) $url_page.="&look_INDEXINT=".$look_INDEXINT;
-        if ($look_KEYWORDS) $url_page.="&look_KEYWORDS=".$look_KEYWORDS;
-        if ($recherche) $url_page.="&user_query=".$recherche;*/
-
+        if ($look_AUTHOR) $search[] = array("inter"=>"or","field"=>2,"operator"=>"BOOLEAN", "value"=>$recherche);
+        if ($look_PUBLISHER) $search[] = array("inter"=>"or","field"=>3,"operator"=>"BOOLEAN", "value"=>$recherche);
+        if ($look_COLLECTION) $search[] = array("inter"=>"or","field"=>4,"operator"=>"BOOLEAN", "value"=>$recherche);
+        if ($look_ABSTRACT) $search[] = array("inter"=>"or","field"=>10,"operator"=>"BOOLEAN", "value"=>$recherche);
+        if ($look_CATEGORY) $search[] = array("inter"=>"or","field"=>11,"operator"=>"BOOLEAN", "value"=>$recherche);
+        if ($look_INDEXINT) $search[] = array("inter"=>"or","field"=>12,"operator"=>"BOOLEAN", "value"=>$recherche);
+        if ($look_KEYWORDS) $search[] = array("inter"=>"or","field"=>13,"operator"=>"BOOLEAN", "value"=>$recherche);
+        
 
         /*if ($htmldom = pmb_charger_page($url_base, $url_page,$mode)) {
@@ -236 +230 @@
                                 $i++;
                         }*/
-                        //Recherche dans tous les champs du mot "loup"
-                        $r=$ws->pmbesOPACAnonymous_simpleSearch($searchType ,$recherche);
+                                                
+                        $r=$ws->pmbesOPACAnonymous_advancedSearch($search);
+                        
                         $searchId=$r["searchId"];
                         $tableau_resultat[0]['nb_resultats'] = $r["nbResults"];

_plugins_/spip-pmb/2_0_0/recherche.html

@@ -23 +23 @@
                         <p class="soustitre">&#171;&nbsp;(#RECHERCHE)&nbsp;&#187;</p>
                 </div>]
-                [(#ENV{recherche_avancee}|=={1}|?{' ',''})
-                        <INCLURE{fond=inc-recherche-avancee}{recherche}{env}>
-                ]
+                <INCLURE{fond=inc-recherche-avancee}{recherche}{env}>
                 [(#ENV{look_SITE}|=={1}|?{' ',''})
                         <INCLURE{fond=inc-recherche-site}{recherche}{env}>