From a194d24d4fb03487aada2bbdfbb11670c1e59fd1 Mon Sep 17 00:00:00 2001 From: preecej Date: Wed, 17 Aug 2011 19:30:25 +0000 Subject: [PATCH] Updated web service URLs svn path=/; revision=160 --- .../LocalSettings/dev.LocalSettings.php | 3 +- .../LocalSettings/proto.LocalSettings.php | 1 - .../LocalSettings/test.LocalSettings.php | 34 +++++++++++++++++-- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php b/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php index 8a59eed..e37fd28 100644 --- a/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php +++ b/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php @@ -144,8 +144,7 @@ require_once( "$IP/extensions/semantic-bundle/SemanticBundle.php" ); include("$IP/extensions/SimpleForms/SimpleForms.php"); -$sfgAutocompletionURLs['remote_species'] = 'http://palea.cgrb.oregonstate.edu/AnnoWiki/prototyping/remote_autocomplete.php?q='; -$sfgAutocompletionURLs['remote_PO_terms'] = 'http://dev.planteome.org/w/prototyping/TermSearch_JSON.php?user=paw&type=autocomplete&field=name&qval=&format=json&max=20'; +$sfgAutocompletionURLs['remote_PO_terms'] = 'http://dev.planteome.org/w/services/TermSearch_JSON.php?user=paw&type=autocomplete&field=name&qval=&format=json&max=20'; $sfgAutocompleteOnAllChars = false; # END: Justin Preece - Semantic Bundle (SMW and other extensions) diff --git a/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php b/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php index ed3ece3..3ef00c3 100644 --- a/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php +++ b/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php @@ -153,7 +153,6 @@ require_once( "$IP/extensions/Loops/Loops.php" ); require_once( "$IP/extensions/semantic-bundle/SemanticBundleSettings.php" ); require_once( "$IP/extensions/semantic-bundle/SemanticBundle.php" ); -$sfgAutocompletionURLs['remote_species'] = 'http://palea.cgrb.oregonstate.edu/AnnoWiki/prototyping/remote_autocomplete.php?q='; $sfgAutocompletionURLs['remote_PO_terms'] = 'http://proto.planteome.org/w/prototyping/TermSearch_JSON.php?user=paw&type=autocomplete&field=name&qval=&format=json&max=20'; $sfgAutocompleteOnAllChars = false; diff --git a/preecej/semantic_wiki/LocalSettings/test.LocalSettings.php b/preecej/semantic_wiki/LocalSettings/test.LocalSettings.php index 0fc5a32..5c6e441 100644 --- a/preecej/semantic_wiki/LocalSettings/test.LocalSettings.php +++ b/preecej/semantic_wiki/LocalSettings/test.LocalSettings.php @@ -46,7 +46,7 @@ $wgStylePath = "$wgScriptPath/skins"; ## The relative URL path to the logo. Make sure you change this from the default, ## or else you'll overwrite your logo when you upgrade! -$wgLogo = "$wgStylePath/common/images/wiki.png"; +$wgLogo = "$wgStylePath/common/images/wiki_logo_with_text.png"; ## UPO means: this is also a user preference option @@ -66,6 +66,7 @@ $wgDBserver = "floret.cgrb.oregonstate.local"; $wgDBname = "test_planteome_annotate"; $wgDBuser = "p_a_wiki_db"; $wgDBpassword = "1yCoP3r5icuM"; +$JobRunRate = 1; # MySQL specific settings $wgDBprefix = ""; @@ -114,7 +115,7 @@ $wgSecretKey = "9fbf4140fef09d215376947e74fef8cd873b79b5f97cdf4baf6cf5226db8b706 ## Default skin: you can change the default skin. Use the internal symbolic ## names, ie 'vector', 'monobook': -$wgDefaultSkin = 'monobook'; +$wgDefaultSkin = 'planteome'; ## For attaching licensing metadata to pages, and displaying an ## appropriate copyright notice / icon. GNU Free Documentation @@ -128,6 +129,35 @@ $wgRightsIcon = "http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png"; $wgDiff3 = "/usr/bin/diff3"; +# BEGIN: Justin Preece - Config changes and Semantic Bundle (SMW and other extensions) +# (moved from top of file to address premature reference to $wgScriptPath) + +#$wgHiddenPrefs[] = 'skin'; +#$wgUseAjax = true; + +#include_once("$IP/extensions/DataTransfer_PS/DataTransfer.php"); + +require_once( "$IP/extensions/semantic-bundle/SemanticBundleSettings.php" ); +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=&format=json&max=20'; +#$sfgAutocompleteOnAllChars = false; + +# END: Justin Preece - Semantic Bundle (SMW and other extensions) + +/** Allow client-side caching of pages */ +$wgCachePages = false; + +/** + * * Set this to current time to invalidate all prior cached pages. Affects both + * * client- and server-side caching. + * * You can get the current date on your server by using the command: + * * date +%Y%m%d%H%M%S + * */ +$wgCacheEpoch = 'date +%Y%m%d%H%M%S'; + # When you make changes to this configuration file, this will make # sure that cached pages are cleared. $wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) ); -- 2.34.1