Changeset 700341

Timestamp:

04/19/2013 02:31:18 PM (11 years ago)

Author:

emirpprime

Message:

v0.9.1

Clean up PHP errors
Migrate to Options array
Housekeeping

Location:

pubmed-publist/trunk

Files:

• includes/admin.php (modified) (4 diffs)
• includes/core.php (modified) (6 diffs)
• pm_publist.php (modified) (1 diff)
• pm_pubmedrequest.php (modified) (8 diffs)
• readme.txt (modified) (1 diff)

pubmed-publist/trunk/includes/admin.php

@@ -4 +4 @@
  **/
 
-<<<<<<< HEAD
 //TODO: Add Purge cache buttons / functions.
 //TODO: Add cache settings
 //TODO: Add PMID exclude setting.
 
-=======
->>>>>>> Initial Commit
 /* settings link in plugin management screen */
 function pm_pubmed_settings_link( $links ) {
@@ -135 +132 @@
             if(isset($key)) {
                 $val = trim(wp_kses($val, ''));
-<<<<<<< HEAD
             } // end if
         } // end foreach
@@ -143 +139 @@
             update_option('pm_publist_settings', $input);
         }
-=======
-
-                if(get_option('pm_publist_'.$key) === FALSE){
-                    add_option('pm_publist_'.$key, $val);
-                }else{
-                    update_option('pm_publist_'.$key, $val);
-                }
-            } // end if
-        } // end foreach
->>>>>>> Initial Commit
         return $input;
     }
@@ -163 +149 @@
     }
     public function pm_publist_create_searchString_field($int){
-<<<<<<< HEAD
         $options = get_option('pm_publist_settings');
         ?><textarea style="width:100%;" rows="5" id="searchString<?php echo $int;?>" name="array_key[searchString<?php echo $int;?>]"><?php echo $options['searchString'.$int];?></textarea><?php
-=======
-        ?><textarea style="width:100%;" rows="5" id="searchString<?php echo $int;?>" name="array_key[searchString<?php echo $int;?>]"><?php echo get_option('pm_publist_searchString'.$int);?></textarea><?php
->>>>>>> Initial Commit
     }
     public function pm_publist_use_info(){

pubmed-publist/trunk/includes/core.php

@@ -29 +29 @@
     $total = $show+$extra;
 
-<<<<<<< HEAD
     $transient = 'pm_pubmedlist'.$show.$extra.$class.$layout;
-=======
-    if ($layout) : $transient = 'pm_pubmedlist'.$show.$total.$class.$layout; else : $transient = 'pm_pubmedlist'.$show.$total.$class.$layout; endif;
->>>>>>> Initial Commit
     $pubs = get_transient( $transient );
     if ( false === $pubs ) {
@@ -174 +170 @@
 
             $xmlCache = pm_publist_DIR.'pm_cache.xml';
-<<<<<<< HEAD
             //TODO: Sort caching out. Remove age chack from pubmedrequest.php and ue just this???
             //Easier to get var from settings here.
-=======
->>>>>>> Initial Commit
             $xmlcache_time = 60*60; // 1 hour
             $timedif = @(time() - filemtime($xmlCache));
@@ -200 +193 @@
                         return false;
                     } else {
-<<<<<<< HEAD
                         $strings = get_option('pm_publist_settings');
-=======
-                        //TODO: must be a better way of handling this.
-                        $strings = array();
-                        if (get_option('test_searchString1')) { array_push($strings,get_option('test_searchString1')); };
-                        if (get_option('test_searchString2')) { array_push($strings,get_option('test_searchString2')); };
-                        if (get_option('test_searchString3')) { array_push($strings,get_option('test_searchString3')); };
-                        if (get_option('test_searchString4')) { array_push($strings,get_option('test_searchString4')); };
-                        if (get_option('test_searchString5')) { array_push($strings,get_option('test_searchString5')); };
-                        if (get_option('test_searchString6')) { array_push($strings,get_option('test_searchString6')); };
->>>>>>> Initial Commit
                         $data = http_build_query($strings);
 
@@ -242 +224 @@
         ////Create page
         $pubs = '<ul class="pm_publist '.$class.'">'.implode($lmbpubs[0]).'</ul>';
-<<<<<<< HEAD
         global $show;
         global $total;
         if($show != $total) {
-=======
-        if($lmbpubs[1]) {
->>>>>>> Initial Commit
             //TODO: Add CSS / JS / Shortcode for this:
             //$pubs .= do_shortcode('[toggle title="More papers"]<ul class="'.$class.'>'.implode($lmbpubs[1]).'</ul>[/toggle]');
@@ -254 +232 @@
         };
 
-<<<<<<< HEAD
         //for next time write transient cache file.
         //but only if no error (basic check using length)
@@ -260 +237 @@
         if (strlen($pubs) > 500){
             set_transient($transient, $pubs, 60*30);
-=======
-        //for next time
-        //write transient cache file.
-        //but only if no error (basic check using length)
-        if (strlen($pubs) > 500){
-            //set_transient($transient, $pubs, 60*30);
-            set_transient($transient, $pubs, 30);
->>>>>>> Initial Commit
         }
     }

pubmed-publist/trunk/pm_publist.php

@@ -3 +3 @@
 Plugin Name: PubMed Publist
 Description: Shortcodes to display a list of publications from PubMed
-<<<<<<< HEAD
 Version: 0.9.1
-=======
-Version: 0.9
->>>>>>> Initial Commit
 Author: Phil Banks
 */

pubmed-publist/trunk/pm_pubmedrequest.php

@@ -2 +2 @@
 ////If Cache is good - use it
 //define some variables.
-<<<<<<< HEAD
 //TODO: Use options to set this cache time
 //TODO: Check there isn't a WP function for writing to disk. Problems on some hosts???
-=======
->>>>>>> Initial Commit
 $cache_time = 60*60*2; // 2 hours
 $cache_file = dirname(__FILE__).'/pm_cache.xml';
@@ -17 +14 @@
 else {
         $nodes = array();
-<<<<<<< HEAD
         if(isset($_POST["searchString1"])) {
             $search1 = 'http://www.ncbi.nlm.nih.gov/pubmed?term='.$_POST["searchString1"].'&report=xml';
@@ -44 +40 @@
 
         //get PubMed data as XML using parallel cURL requests for speed.
-=======
-        //TODO: Make multi string compatible. Work out how to test how many then do appropriate for that many.
-        if(isset($_POST["0"])) {
-            $search1 = 'http://www.ncbi.nlm.nih.gov/pubmed?term='.$_POST["0"].'&report=xml';
-            array_push($nodes, $search1);
-        }
-        if(isset($_POST["1"])) {
-            $search2 = 'http://www.ncbi.nlm.nih.gov/pubmed?term='.$_POST["1"].'&report=xml';
-            array_push($nodes, $search2);
-        }
-        if(isset($_POST["2"])) {
-            $search3 = 'http://www.ncbi.nlm.nih.gov/pubmed?term='.$_POST["2"].'&report=xml';
-            array_push($nodes, $search3);
-        }
-        if(isset($_POST["3"])) {
-            $search4 = 'http://www.ncbi.nlm.nih.gov/pubmed?term='.$_POST["3"].'&report=xml';
-            array_push($nodes, $search4);
-        }
-        if(isset($_POST["4"])) {
-            $search5 = 'http://www.ncbi.nlm.nih.gov/pubmed?term='.$_POST["4"].'&report=xml';
-            array_push($nodes, $search5);
-        }
-        if(isset($_POST["5"])) {
-            $search6 = 'http://www.ncbi.nlm.nih.gov/pubmed?term='.$_POST["5"].'&report=xml';
-            array_push($nodes, $search6);
-        }
-
-
-        //get PubMed data as XML using parallel cURL requests for speed.
-        ////$nodes = array($search1, $search2, $search3, $search4, $search5, $search6);
->>>>>>> Initial Commit
         $node_count = count($nodes);
         $curl_arr = array();
@@ -94 +59 @@
 
 
-<<<<<<< HEAD
-=======
-
->>>>>>> Initial Commit
         //function to clean PubMed data so it is valid XML.
         function cleanPubmed($dirtyPubmed) {
@@ -110 +71 @@
             $query = array();
             foreach ($xml1->PubmedArticle as $paper) {
-                $query[] = sprintf('(MedlineCitation/PMID != %s)',$paper->MedlineCitation->PMID);
+            $query[] = sprintf('(MedlineCitation/PMID != %s)',$paper->MedlineCitation->PMID);
             }
             $query = implode('and', $query);
@@ -116 +77 @@
             $xmlClean = '<Document>';
             foreach ($xml2->xpath(sprintf('PubmedArticle[%s]', $query)) as $paper) {
-                $xmlClean .= $paper->asXML();
+            $xmlClean .= $paper->asXML();
             }
             $xmlClean .= '</Document>';
@@ -142 +103 @@
 
 
-<<<<<<< HEAD
         //Loop through set nodes and clean/convert
-=======
-        //Loop through set nodes and process them
->>>>>>> Initial Commit
         for($i = 0; $i < $node_count; $i++) {
             $num = $i+1;
@@ -154 +111 @@
             ${"xml$num"} = new SimpleXMLElement(${"search$num"});
         }
-<<<<<<< HEAD
         //Loop through nodes and dedupe/merge
-=======
-
->>>>>>> Initial Commit
         $output = $xml1;
         if ($node_count > 1) {
             for($i = 0; $i < $node_count-1; $i++) {
                 $num = $i+2;
-<<<<<<< HEAD
-=======
-                error_log($num);
-
->>>>>>> Initial Commit
                 ${"xml$num.clean"} = dedupeXML($output,${"xml$num"});
                 $output = mergeXML($output,${"xml$num.clean"});

pubmed-publist/trunk/readme.txt

@@ -57 +57 @@
 == Changelog ==
 
+
+
+
+
 = 0.9 =
-
 * Initial Beta Release