updates related to moving db connection strings to .conf files

svn path=/; revision=163

diff --git a/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php b/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php
index e37fd28ad87c507b9d4802ea7d4a6d1990419374..749ecf6055e5f2d9f0f855a358806a2ed311ffa0 100644 (file)
--- a/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php
+++ b/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php
@@ -64,10 +64,10 @@ $wgEmailAuthentication = true;
 
 ## Database settings
 $wgDBtype           = "mysql";
-$wgDBserver         = "localhost";
-$wgDBname           = "dev_planteome_annotate";
-$wgDBuser           = "p_a_wiki_db";
-$wgDBpassword       = "1yCoP3r5icuM";
+$wgDBserver         = $_SERVER['dev_wgDBServer'];
+$wgDBname           = $_SERVER['dev_wgDBName'];
+$wgDBuser           = $_SERVER['dev_wgDBUser'];
+$wgDBpassword       = $_SERVER['dev_wgDBPassword'];
 $JobRunRate       = 1;
 
 # MySQL specific settings

diff --git a/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php b/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php
index 3ef00c3c5b0c24cd38907726f7453f94c3f388fa..15b790215805f56434ecb232bd2261f889a4b99b 100644 (file)
--- a/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php
+++ b/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php
@@ -64,10 +64,10 @@ $wgEmailAuthentication = true;
 
 ## Database settings
 $wgDBtype           = "mysql";
-$wgDBserver         = "localhost";
-$wgDBname           = "proto_planteome_annotate";
-$wgDBuser           = "p_a_wiki_db";
-$wgDBpassword       = "1yCoP3r5icuM";
+$wgDBserver         = $_SERVER['proto_wgDBServer'];
+$wgDBname           = $_SERVER['proto_wgDBName'];
+$wgDBuser           = $_SERVER['proto_wgDBUser'];
+$wgDBpassword       = $_SERVER['proto_wgDBPassword'];
 $wgJobRunRate       = 1;
 
 # MySQL specific settings

diff --git a/preecej/semantic_wiki/LocalSettings/test.LocalSettings.php b/preecej/semantic_wiki/LocalSettings/test.LocalSettings.php
index 5c6e44125d26949ef068cbf302ea82ddaef7aa86..df51983afa228bec15d5f74a971f2862fe5ea8e2 100644 (file)
--- a/preecej/semantic_wiki/LocalSettings/test.LocalSettings.php
+++ b/preecej/semantic_wiki/LocalSettings/test.LocalSettings.php
@@ -62,10 +62,10 @@ $wgEmailAuthentication = true;
 
 ## Database settings
 $wgDBtype           = "mysql";
-$wgDBserver         = "floret.cgrb.oregonstate.local";
-$wgDBname           = "test_planteome_annotate";
-$wgDBuser           = "p_a_wiki_db";
-$wgDBpassword       = "1yCoP3r5icuM";
+$wgDBserver         = $_SERVER['test_wgDBServer'];
+$wgDBname           = $_SERVER['test_wgDBName'];;
+$wgDBuser           = $_SERVER['test_wgDBUser'];
+$wgDBpassword       = $_SERVER['test_wgDBPassword'];
 $JobRunRate         = 1;
 
 # MySQL specific settings
@@ -142,8 +142,8 @@ require_once( "$IP/extensions/semantic-bundle/SemanticBundle.php" );
 
 #include("$IP/extensions/SimpleForms/SimpleForms.php");
 
-#$sfgAutocompletionURLs['remote_PO_terms'] = 'http://palea.cgrb.oregonstate.edu/paw/services/TermSearch_JSON.php?user=paw&type=autocomplete&field=name&qval=<substr>&format=json&max=20';
-#$sfgAutocompleteOnAllChars = false;
+$sfgAutocompletionURLs['remote_PO_terms'] = 'http://palea.cgrb.oregonstate.edu/paw/services/TermSearch_JSON.php?user=paw&type=autocomplete&field=name&qval=<substr>&format=json&max=20';
+$sfgAutocompleteOnAllChars = false;
 
 # END: Justin Preece - Semantic Bundle (SMW and other extensions)
 

diff --git a/preecej/semantic_wiki/forms/Annotation.wiki b/preecej/semantic_wiki/forms/Annotation.wiki
index 950381cf7649e0c2353306987465bbfb985e9db8..51406b69dc172ed0df47675d11c951206888b2dc 100644 (file)
--- a/preecej/semantic_wiki/forms/Annotation.wiki
+++ b/preecej/semantic_wiki/forms/Annotation.wiki
@@ -24,7 +24,7 @@ __NOTOC__
             [[Is Associated With Template::Annotation]]
             |?is_Provenance
          }}
-    | {{{field|Species Name|restricted}}}
+    | {{{field|Species Name|autocomplete on property=Has Reference Taxon|restricted}}}
     | {{{field|Species Name|autocomplete on property=Has Reference Taxon}}}
   }}
 |-