openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1174 - in sites/oxford.openguides.org: . lib lib/OpenGuides lib/OpenGuides/SpamPlugin
by svnadmin＠urchin.earth.li 22 Jun '08

22 Jun '08

Author: dom Date: 2008-06-22 01:05:51 +0100 (Sun, 22 Jun 2008) New Revision: 1174 Added: sites/oxford.openguides.org/lib/ sites/oxford.openguides.org/lib/OpenGuides/ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm Log: local akismet spam detector Added: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm =================================================================== --- sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm (rev 0) +++ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2008-06-22 00:05:51 UTC (rev 1174) @@ -0,0 +1,62 @@ +# $HeadURL$ +# $LastChangedRevision$ +# $LastChangedDate$ +# $LastChangedBy$ + +package OpenGuides::SpamPlugin::Akismet; + +use strict; +use warnings; + +use Net::Akismet; +use Data::Dumper; +use Config::Tiny; +use MIME::Lite; + +sub notify_admins { + my ( $class, %args ) = @_; + my $reason = delete $args{reason}; + my $message = MIME::Lite->new( + From => $args{email}, + To => $args{email}, + Subject => "Attempted spam edit on " . $args{'url'}, + Data => "Someone just tried to edit oxford.openguides.org, and " + . "Akismet said no.\n\n" + . "Here's a dump of the details:\n" + . Dumper( \%args ), + ); + $message->send; +} + +sub looks_like_spam { + my ( $class, %args ) = @_; + # http://dev.openguides.org/ticket/253 + # shouldn't have to fish this out ourselves + # hacking core OpenGuides code is for another day + my $config = Config::Tiny->read('wiki.conf'); + my $api_key = $config->{_}->{'spam_detector_akismet_key'}; + my $url = $config->{_}->{'script_url'}; + my $email = $config->{_}->{'contact_email'}; + + my $akismet = Net::Akismet->new( + KEY => $api_key, + URL => $url, + ) + or die "Could not verify API key\n"; + my %check_data = ( + USER_IP => $ENV{'REMOTE_ADDR'}, + COMMENT_USER_AGENT => $ENV{'HTTP_USER_AGENT'}, + COMMENT_CONTENT => $args{content}, + COMMENT_AUTHOR => $args{metadata}->{username}, + ); + my $result = $akismet->check( %check_data ); + + if ( $result eq 'true' ) { + $class->notify_admins( %args, url => $url, email => $email ); + return 1; + } else { + return 0; + } +} + +1; Property changes on: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm ___________________________________________________________________ Name: svn:keywords + HeadURL LastChangedRevision LastChangedDate LastChangedBy

1 0

r1173 - branches/new-install-process
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 19:48:15 +0100 (Sat, 21 Jun 2008) New Revision: 1173 Modified: branches/new-install-process/TROUBLESHOOTING Log: Documented use of wiki-toolkit-setupdb for people who need to rerun the table creation process. Modified: branches/new-install-process/TROUBLESHOOTING =================================================================== --- branches/new-install-process/TROUBLESHOOTING 2008-06-21 17:24:00 UTC (rev 1172) +++ branches/new-install-process/TROUBLESHOOTING 2008-06-21 18:48:15 UTC (rev 1173) @@ -36,3 +36,9 @@ do failed...". ---------------------------------------------------------------------- + +If you need to rerun the table creation process for any reason, use +wiki-toolkit-setupdb, which should have been installed when you installed +the Wiki::Toolkit modules. + +----------------------------------------------------------------------

1 0

r1172 - in branches/new-install-process: bin lib/OpenGuides
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 18:24:00 +0100 (Sat, 21 Jun 2008) New Revision: 1172 Modified: branches/new-install-process/bin/openguides-install branches/new-install-process/lib/OpenGuides/Config.pm Log: Standardise slash vs. no slash on ends of directory names in install process (cosmetic change only). Modified: branches/new-install-process/bin/openguides-install =================================================================== --- branches/new-install-process/bin/openguides-install 2008-06-21 17:15:43 UTC (rev 1171) +++ branches/new-install-process/bin/openguides-install 2008-06-21 17:24:00 UTC (rev 1172) @@ -231,12 +231,12 @@ if ( $var eq "template_path" && !defined $existing_config->$var ) { $def = $install_directory; $def .= "/" unless $def =~ m|/$|; - $def .= "templates"; + $def .= "templates/"; } if ( $var eq "custom_template_path" && !defined $existing_config->$var ) { $def = $install_directory; $def .= "/" unless $def =~ m|/$|; - $def .= "custom-templates"; + $def .= "custom-templates/"; } # If a Google Maps URL was provided last time we know the centre_lat Modified: branches/new-install-process/lib/OpenGuides/Config.pm =================================================================== --- branches/new-install-process/lib/OpenGuides/Config.pm 2008-06-21 17:15:43 UTC (rev 1171) +++ branches/new-install-process/lib/OpenGuides/Config.pm 2008-06-21 17:24:00 UTC (rev 1172) @@ -113,7 +113,7 @@ licence_info_url => "", spam_detector_module => "", host_checker_module => "", - static_path => "/usr/local/share/openguides/static", + static_path => "/usr/local/share/openguides/static/", send_moderation_notifications => 1 );

1 0

r1171 - in branches/new-install-process: . bin
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 18:15:43 +0100 (Sat, 21 Jun 2008) New Revision: 1171 Modified: branches/new-install-process/SETUP branches/new-install-process/bin/openguides-install Log: Make it clear in SETUP that the script_url needs an http Modified: branches/new-install-process/SETUP =================================================================== --- branches/new-install-process/SETUP 2008-06-21 17:13:23 UTC (rev 1170) +++ branches/new-install-process/SETUP 2008-06-21 17:15:43 UTC (rev 1171) @@ -173,7 +173,8 @@ "What URL does the install directory map to?" Give the full address needed to access the installation directory with -a web browser - for example http://london.openguides.org/ +a web browser, including the "http://" prefix - for example, +http://london.openguides.org/ "Do you want me to munge a custom lib path into the scripts?" Modified: branches/new-install-process/bin/openguides-install =================================================================== --- branches/new-install-process/bin/openguides-install 2008-06-21 17:13:23 UTC (rev 1170) +++ branches/new-install-process/bin/openguides-install 2008-06-21 17:15:43 UTC (rev 1171) @@ -78,9 +78,6 @@ $targets{"$label.cgi"} = find_script( "openguides-$label-script" ); } -# The database setup script. -my $setup = find_script( "wiki-toolkit-setupdb" ); - my $force; GetOptions('force' => \$force); unless ($force) { @@ -116,6 +113,9 @@ content_above_navbar_in_html show_gmap_in_node_display force_wgs84 send_moderation_notifications); +my %blank_ok = map { $_ => 1 } + qw( dbpass dbhost ); + my $skip_config = $force ? 'y' : prompt( "y", "Skip OpenGuides configuration?", "y or n", "n" ); @@ -166,7 +166,8 @@ sqlite => "DBD::SQLite", ); eval "require $drivers{$dbtype}"; -warn "$drivers{$dbtype} is needed to run a $dbtype database" if $@; +die "\nSorry; $drivers{$dbtype} is needed to run a $dbtype database - please " + . "install this\nmodule and try again.\n\n" if $@; push @answers, { question => $dbtype_qu, variable => "dbtype", @@ -205,13 +206,12 @@ ) ) { my $q_method = $var . "__qu"; my $qu = $existing_config->$q_method; - my $type = $yn_vars{$var} ? "y_n" : ""; my $def = $existing_config->$var || ""; my $val = $def; # Override dbname question for SQLite only. if ( $dbtype eq "sqlite" and $var eq "dbname" ) { - $qu = "what's the full filename of the SQLite database this site runs on?"; + $qu = "What's the full filename of the SQLite database this site runs on?"; } if ( $dbtype eq "sqlite" and @@ -322,12 +322,17 @@ # Here is where we actually ask the questions. unless ( $skip_config ) { - if ( $type eq "y_n" ) { +print $var . "\n"; + if ( $yn_vars{$var} ) { # may be stored as true/false integer value if ( $def =~ /^\d+$/ ) { $def = $def ? "y" : "n"; } $val = prompt( "y", $qu, "y or n", $def ); + } elsif ( $blank_ok{$var} ) { +print "boo!\n"; + $val = prompt( "s", $qu, "optional", $def, + sub { print "hello!\n"; return 1; } ); } else { $val = prompt( "x", $qu, "", $def ); }

1 0

r1170 - branches/new-install-process
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 18:13:23 +0100 (Sat, 21 Jun 2008) New Revision: 1170 Modified: branches/new-install-process/Build.PL branches/new-install-process/PREREQUISITES Log: Added missing prereq of Term::Prompt; removed some hardcoding. Modified: branches/new-install-process/Build.PL =================================================================== --- branches/new-install-process/Build.PL 2008-06-21 16:55:10 UTC (rev 1169) +++ branches/new-install-process/Build.PL 2008-06-21 17:13:23 UTC (rev 1170) @@ -22,19 +22,24 @@ mkdir( File::Spec->catfile( $path, "OpenGuides" ) ); die "Can't make template install folder: $!\n" unless (-d File::Spec->catfile( $path, "OpenGuides" ) ); - mkdir( File::Spec->catfile( $path, "OpenGuides", "templates" ) ); - die "Can't make template install folder: $!\n" unless (-d File::Spec->catfile( $path, "OpenGuides", "templates" ) ); + my $templ_dir = File::Spec->catfile( $path, "OpenGuides", "templates" ); - print "Installing templates to $path/OpenGuides/templates\n"; - opendir TEMPLATES, "templates" or die "Can't open template source folder: $!\n"; + mkdir( $templ_dir ); + die "Can't make template install folder: $!\n" unless (-d $templ_dir ); + + print "Installing templates to $templ_dir\n"; + opendir TEMPLATES, "templates" + or die "Can't open template source folder: $!\n"; + for (grep { /\.(tt)$/ } readdir(TEMPLATES)) { - print " installing template $_\n"; + #print " installing template $_\n"; File::Copy::copy( - File::Spec->catfile('templates', $_), - File::Spec->catfile( $path, "OpenGuides", "templates", $_ ) + File::Spec->catfile( "templates", $_ ), + File::Spec->catfile( $templ_dir, $_ ) ) or die "Error copying $_: $!\n";; } closedir(TEMPLATES); + print "Done!\n"; return $ret; } @@ -78,6 +83,7 @@ 'Parse::RecDescent' => 0, 'POSIX' => 0, 'Template' => '2.15', # for hash.delete and string.remove vmethods + 'Term::Prompt' => 0, 'Time::Piece' => 0, 'URI::Escape' => 0, 'XML::RSS' => 0, Modified: branches/new-install-process/PREREQUISITES =================================================================== --- branches/new-install-process/PREREQUISITES 2008-06-21 16:55:10 UTC (rev 1169) +++ branches/new-install-process/PREREQUISITES 2008-06-21 17:13:23 UTC (rev 1170) @@ -41,6 +41,7 @@ Plucene POSIX Template +Term::Prompt Time::Piece URI::Escape XML::RSS

1 0

r1169 - branches/new-install-process
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 17:55:10 +0100 (Sat, 21 Jun 2008) New Revision: 1169 Added: branches/new-install-process/SETUP Modified: branches/new-install-process/INSTALL Log: Documentation updates that I forgot to commit (ta Aidy). Modified: branches/new-install-process/INSTALL =================================================================== --- branches/new-install-process/INSTALL 2008-06-16 01:31:05 UTC (rev 1168) +++ branches/new-install-process/INSTALL 2008-06-21 16:55:10 UTC (rev 1169) @@ -1,403 +1,42 @@ OpenGuides installation instructions ==================================== +OpenGuides installation has two steps - installing the modules, and setting +up a Guide. Module installation is described in this file, and setting up +a Guide is described in SETUP. -If while following the instructions below or while trying to use your -OpenGuides install you see an error that you don't understand, please -consult the TROUBLESHOOTING file. -For details about installing multiple OpenGuides sites on a single -server, or installing OpenGuides into a directory that isn't where -your system Perl library is, see further down this file. +* Basic installation of modules -* Basic installation +The OpenGuides distribution _should_ be installable with CPAN.pm or +CPANPLUS.pm - i.e., the CPAN shell - and this is probably the simplest +way to do it unless you already know you prefer manual installation. +If you do prefer manual installation, then: + Unpack the distribution (using for example 'tar' or 'WinZip'), and set -your working directory to be the top level of the distribution. +your working directory (using for example 'cd') to be the top level of +the distribution. -If you have an existing "wiki.conf" configuration file and you wish -to keep using the values in that, copy it to this directory. - Now execute the following commands: -perl Build.PL -perl Build -perl Build test -perl Build install + perl Build.PL + perl Build + perl Build test -The very first of these commands asks a number of questions regarding -the installation. +These will prepare your system for installation of the modules, and run some +tests to make sure that everything is OK. If everything is not OK, then please +report a bug. If everything is OK, i.e. all the tests report success, then + perl Build install - "Skip OpenGuides configuration?" +should install the modules for you. If you get error messages saying +you don't have the correct permissions, then you need to do something +along the lines of 'sudo perl Build install', or install the modules +in a directory that you do have permission to write to (see below), or +ask your sysadmin to do the installation for you. -Answer "n" to this question unless you really know what you're doing. -It's mainly there for developers. (If you already have a configuration -file, and wish to use it without the build script asking you this -question, run Build.PL with the option --force. This will also skip -the "Continue with install?" question.) - - "What type of database do you want the site to run on?" - -Answer "postgres", "mysql", or "sqlite". - - - "What's the name of the database that this site runs on?" - "...the database user that can access that database?" - "...the password that they use to access the database?" - -You should create (or ask your ISP/sysadmin to create) a database -specifically for the use of OpenGuides. If you have more than one -OpenGuides installation, for example if you run guides for more than -one city, each installation will need its own database. - - - "...the machine that the database is hosted on? (blank if local" - -If the database is running on a local machine with username/password -authentication then just press RETURN to skip this question. If it -is running on a local machine with IDENT authentication then you may -need to answer "localhost" to this question. If it is running on a -remote machine then enter the full hostname of that machine. - - - "What do you want the script to be called?" - -The default is for the main script to be called "wiki.cgi", but -you may prefer to name it after your city - "leeds-guide.cgi" for -example. Note that your webserver may be configured to only allow -execution of scripts ending in, for example, ".cgi" - - - "What directory should I install it in?" - -You need to pick a directory for the OpenGuides software to be -installed in. This must be one known to the webserver as containing -CGI scripts. You will need to have write permission on this directory -when you come to run "perl Build install"; unless this is a private -directory belonging to you then this might require an 'su' or 'sudo' -to root under Unix. - - - "What directory should I install the templates in?" - "Where should I look for custom templates?" - -Normally these will be in the install directory, but they can be anywhere. -Custom templates are intended to be user-modified, so you might want to -put them somewhere in /etc. - - - "What URL does the install directory map to?" - -Give the full address needed to access the installation directory with -a web browser - for example http://london.openguides.org/ - - - "Do you want me to munge a custom lib path into the scripts?" - -If you have installed some or all of the required Perl modules (or indeed -the OpenGuides modules themselves) into a private directory, you will -need to tell the scripts where to find these modules. Enter the paths -to search here just as you would enter them in a 'use lib qw( ... );' -in a Perl script. - - - "Do you want to use Plucene for searching?" - -This question is no longer asked, but documentation here is retained for -the benefit of people upgrading. - -If you are changing to Plucene from Search::InvertedIndex, you will -need to do two things: - - either delete your old indexes (they're just files in the index - directory) or use a different index directory - - reindex your entire wiki (see reindex.pl in the examples/ - directory of this distribution) - - - "What directory can I use to store indexes in for searching?" - -You need a directory to store files used as indexes for the site. The -user that your script will run as will need write permission on this -directory. Under some webserver configurations this might be a -dedicated user - 'nobody' or 'www-data' for example, but for many -multi-user systems this will just be yourself. - - - "Do you want to enable page deletion?" - "Please specify a password for the site admin." - -The default is to disable page deletion. If you choose to enable the -page deletion mechanism then you will need to add a password to your -wiki.conf by answering the question above or manually using a line such as - admin_pass = putyourpasswordhere -Users who know this password will be able to delete unwanted pages - -along with all their history - from your wiki. -*** USE WITH CAUTION. DELETED PAGES CANNOT BE RECOVERED. *** - - - "What's the URL of the site's stylesheet?" - -Supplying an answer to this question is optional. There are example -stylesheets in the examples/ directory - note that these will not be -automatically installed. - - - "What's the wiki called?" - -This is a title which will appear at the top of every page. If you have -more than one OpenGuides installation at the same site then each should -have a unique name, since this name is used to manage user preferences. - - - "Do you want the navigation bar included on the home page?" - -Answer "y" or "n". - - - "Do you want the ten most recent changes included on the home page?" - -Answer "y" or "n". - - - "Do you want the Random Page link to avoid returning a locale page? - "Do you want the Random Page link to avoid returning a category page? - -Answer "y" or "n". The defaults are "n", which means that Random Page is as -likely to return a category or locale page as anything else. If the category -and locale pages on your Guide are generally just lists of things in that -category/locale, you probably want to pick "y" here. If, on the other hand, -your category/locale pages generally have substantial content of their own, -you may prefer to choose "n". - - - "Do you want the content to appear above the navbar in the HTML?" - -Answer "y" or "n". The default is "n", for reasons of backwards -compatibility with existing stylesheets, but the recommended answer is -"y", as this will help search engines to find the most relevant parts -of your pages. - - - "What should the home page of the wiki be called?" - "How would you describe the wiki?" - -Self-explanatory. - - - "What city is the wiki based in?" - "What country is the wiki based in?" - -If the wiki will not be city or country specific you can leave either or -both of these blank. - - - "Contact email address for the wiki admin?" - -Self explanatory. - - - "What language will the site be in? (Please give an ISO language code.)" - -eg "en" for English, "it" for Italian. -See http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt - - - "What's the name of the node or page to use for the text formatting - rules link?" - "What URL do you want to use for the text formatting rules" - -From 0.19, OpenGuides allows users to choose whether or not to have a -permanent link to the text formatting rules node or page in their navbar. -You need to put the name of that node or URL in here for it to work, though. -You might want to call the node "Text Formatting Examples", -"Text Formatting Rules", "House Style" or whatever. - -Note that these the latter question will override the former, so if you -want to use a local node make sure to leave the latter blank. - - "Make node titles link to node backlinks (C2 style)?" - -This refers to turning titles into links which bring up a list of referring -pages. This was the convention with older wikis ("C2" refers to the original -wiki at http://c2.com/cgi/wiki), but is not intuitive. - - "Do you have a Google Maps API key to use with this guide?" - -If you want Google Maps integration, you need to register with Google to get -an API key. Visit http://www.google.com/apis/maps/signup.html and follow the -instructions. Paste the great long string into the console window where you -are installing. See README.GMAPS for more information. - - "What is the longitude of the centre point of a map to draw for your guide?" - "What is the latitude of the centre point of a map to draw for your guide?" - -It's probably a good idea to pick some notionally central point for your -guide. For example, Carfax for Oxford, Charing Cross for London. As a -convenience, you may paste in a Google Maps URL for the centre longitude -question and the (long,lat) will be parsed out from the URL. - - "What default zoom level shall we use for Google Maps?" - "What default zoom level shall we use for Google Maps in the search results?" - -The defaults are probably appropriate in most cases. - - "Would you like to display a Google Map on every node that has geodata?" - -Answer "y" or "n". Note that an answer of "y" will only take effect if you've -supplied a Google Maps API key above. Note further that users can choose to -turn this off in their preferences. - - "Forcibly treat stored lat/long data as if they used the WGS84 ellipsoid?" - -Default this answer if you don't know what it means. - - "Do you have a Google Analytics key to use with this guide?" - -If you'd like to use Google Analytics to track the traffic on your guide, -visit http://www.google.com/analytics/ to sign up for a key. The answer to -this question is the string in quotes in the HTML fragment they ask you to -paste into your HTML, something along the lines of _uacct = "UA-1234567-1" -- it's the UA-1234567-1 part that you need to put in here. If you've -forgotten your key, go to Analytics Settings, click "Edit" under Settings, -then click "Check Status" in the top right-hand corner of the box with grey -stripes. - - - "What licence will you use for the guide?" - -We strongly recommend that you think at the outset about the licence your -guide will use, for maximum usefulness. In particular for a guide that will -be on the OpenGuides network, we recommend the -"Creative Commons Attribution-ShareAlike 2.5" licence. - - "What is the URL to your licence?" - -If you used our recommendation above the URL you will want here is: -http://creativecommons.org/licenses/by-sa/2.5/ - - "What is the URL to your local page about your licensing policy?" - -You should probably include a page on your wiki about your local licensing -policy, but you can leave this blank for now if you don't have one yet. - - "What module would you like to use for spam detection? (optional)" - -The module you choose should have a method called "looks_like_spam", which -accepts a hash with content and metadata as keys, and returns true or false -to the question of whether the edit should be considered to be spam. - - "What directory should we install static content (CSS, images, javascript) - to?" - -OpenGuides comes with some static content which will be installed -automatically. - - "What is the URL corresponding to the static content?" - -You will need to configure the above directory in your web server, then -input the URL the content will be visible at here. - - "Should we send email notifications when a moderated node is edited?" - -For spam avoidance, you can configure certain nodes to require moderation. -To ensure that such edits are noticed, OpenGuides can email you. - - "Distance calculation methods available are: - 1) British National Grid - 2) Irish National Grid - 3) UTM ellipsoid - Which would you like to use?" - - (and if you choose UTM ellipsoid) - "Which ellipsoid would you like to use? (eg 'Airy', 'WGS-84')" - -See http://www.vterrain.org/Projections/ for how this all works. -A UTM (Universal Transverse Mercator) ellipsoid maps latitude and -longitude to eastings and northings on a square grid, which allows -more accurate distance calculations within the guide. The British and -Irish National Grids are scaled and parametrised versions of UTM -ellipsoids (Airy 1830 in the British case, Modified Airy in the Irish). - -Please note that at the moment there is no provision for changing your -mind later about which ellipsoid to use, but it shouldn't be too hard -to write a conversion script so don't worry too much about picking the -wrong one. However do note that once you've entered some location -data you should not change this value in the config file without running -some kind of converter. - -If you decide to use the British or Irish National Grid, your users -will be able to choose between entering location data as lat/long -or as grid co-ordinates. - -You must have Geography::NationalGrid::GB installed to use the British -National Grid, Geography::NationalGrid::IE to use the Irish National -Grid, and Geo::Coordinates::UTM to use a UTM ellipsoid. - -If you want to use a UTM ellipsoid, WGS-84 is the best choice, as it -will allow you to use the Google Maps support with the minimum of fuss. - -* Dependency errors - -If, after you have answered these questions, the build script complains -about missing dependencies, don't panic! Simply install them from CPAN and -then try again. Note that a wiki.conf file will have been written out at -this point, so if you retain it you won't have to answer all the questions -again. - -* Custom templates and CSS - -Once you have installed OpenGuides you may wish to edit templates that -provide site-specific design. These templates are stored in the directory -custom-templates/ by default and are described in the file CUSTOMISATION. - -The id and class tags used for the CSS in OpenGuides are specified in -README.CSS. - -* Security - -The installer will try to create (or modify an existing) a .htaccess file -to protect wiki.conf, which contains sensitive data (ie passwords). -However we cannot tell whether apache (or any other web server you may be -using) is using this file, so you should check that it functioning and that -you cannot access wiki.conf over HTTP. - -You should also configure wiki.conf with the minimum permissions required -so that local users cannot read the file. This is difficult to automate, -but the file should be probably be mode 0640, owned by root or an admin -user, and set to the group the web server runs with. - -* Web server configuration - -In order to let your web server serve up OpenGuides correctly, you will -have to tell it to recognise your installation directory as one -containing CGI scripts. However you can make your URLs nicer by -employing mod_rewrite as well. The following Apache configuration -directives show how: - - Alias /myguide /usr/lib/cgi-bin/myguide - <Directory /usr/lib/cgi-bin/myguide> - Options FollowSymLinks Indexes ExecCGI - RewriteEngine on - RewriteBase /myguide/ - RewriteRule ^$ wiki.cgi [L] - </Directory> - Redirect /cgi-bin/myguide/ http://www.example.com/myguide/ - -You will of course need to make the appropriate substitutions for -your site. You also need to make sure that mod_rewrite is enabled in -your web server before adding such a configuration. The final step in -this URL tidying is to tell OpenGuides that the main CGI script can be -assumed to be called from the root of the install directory; do this by -setting the script name to be empty in wiki.conf: - - # what do you want the script to be called? - script_name = - -Currently the Build script does not support this value, so you will -have to make sure that you fix this up after an upgrade. - * Custom install locations If you wish to install the OpenGuides modules in a private directory, @@ -415,46 +54,6 @@ perl Build.PL config='sitelib=/path/to/my/modules/' -If any or all of the modules required by the OpenGuides scripts are in -a private directory, then you'll need to tell the scripts where to find -them. See the section above about munging in a custom lib path. - ----------------------------------------------------------------------- - -Important note for those using SQLite: - -The user your CGI is running as must have write access to not only the -database file itself, but the directory that the file is in, in order -that it can write a lockfile. If it doesn't have write access to the -database file, you'll see errors like "Unhandled error: [DBD::SQLite::db -do failed...". - ----------------------------------------------------------------------- - -* Multiple installations - -If you want to run multiple OpenGuides sites on one machine, you can use -some tricks to make life easier. This isn't currently part of the official -install routine, but will generally work. In the rest of this section we -will assume that you already have a working OpenGuides install for a -single site. - -Make a directory for the new site, and populate it with a set of symlinks -to the main installation directory (ie. for wiki.cgi, supersearch.cgi, -newpage.cgi, preferences.cgi, and the templates directory). wiki.conf -will not be a symlink, since this will differ from the original site. -In this case, simply copy the wiki.conf from the original install and -modify it in the obvious way; most importantly, by giving it a different -database name (we'll create the database in a moment). Don't forget to -set up a separate directory for indices for the new site. - -Normally, the database is created by the installation process described -above; however since we only want one copy of the modules and CGI -programs, it isn't appropriate to run them again. So we will make use of -the utility program "cgi-wiki-setupdb" which is included with the -Wiki::Toolkit distribution. Documentation for this command can be found in -its man page; run this with the appropriate arguments to create the -new database. - -Once the key step of setting up the database has been performed, and the -web server configured appropriately, the new site should be ready to go! +If you do choose this option, then when you come to set up a Guide you'll +need to make sure that the scripts know where to find your modules. See +the documentation on custom lib paths in SETUP. Added: branches/new-install-process/SETUP =================================================================== --- branches/new-install-process/SETUP (rev 0) +++ branches/new-install-process/SETUP 2008-06-21 16:55:10 UTC (rev 1169) @@ -0,0 +1,421 @@ +OpenGuides setup instructions +============================= + +OpenGuides installation has two steps - installing the modules, and setting +up a Guide. Module installation is described in INSTALL, and setting up +a Guide is described in this file. You need to install the modules before +you can set up a Guide. + + +* Basic setup + +Guide setup is done using the script + + openguides-install + +which should have been installed somewhere suitable when you installed +the modules. If it isn't in your path, then you could try the +"locate" or "find" commands to figure out where it is. If it doesn't +seem to be anywhere on your system, then you may be using an old version +of OpenGuides - upgrade to the latest version, and then try again. + +When you run this script, it will ask you a number of questions. Once +you've answered them all, the script will write out a configuration file +containing all your answers, and then install the CGI scripts, templates, +any static content (e.g. CSS), and the configuration file in the places +you told it to. + +These questions are described below in the section entitled "Setup questions". + + +* Important note for those using SQLite: + +The user that your Guide is running as must have write access to not only +the database file itself, but the directory that the file is in, in order +that it can write a lockfile. If it doesn't have write access to the +database file, you'll see errors like "Unhandled error: [DBD::SQLite::db do +failed...". + + +* Custom templates and CSS + +Once you have set up a Guide, you may wish to edit certain of the templates +that provide site-specific design. These templates are stored in the +directory custom-templates/ by default and are described in the file +CUSTOMISATION. + +The id and class tags used for the CSS in OpenGuides are specified in +README.CSS. + + +* Security + +The openguides-install script will try to create an .htaccess file (or +modify any existing one) in order to protect wiki.conf, which contains +sensitive data (specifically, passwords). However we cannot tell whether +apache (or any other web server you may be using) is using this file, so +you should check that is it functioning and that you cannot access +wiki.conf over HTTP. + +You should also configure wiki.conf with the minimum permissions required +so that local users cannot read the file. This is difficult to automate, +but the file should be probably be mode 0640, owned by root or an admin +user, and set to the group the web server runs with. + + +* Web server configuration + +In order to let your web server serve up OpenGuides correctly, you will +have to tell it to recognise your installation directory as one +containing CGI scripts. However you can make your URLs nicer by +employing mod_rewrite as well. The following Apache configuration +directives show how: + + Alias /myguide /usr/lib/cgi-bin/myguide + <Directory /usr/lib/cgi-bin/myguide> + Options FollowSymLinks Indexes ExecCGI + RewriteEngine on + RewriteBase /myguide/ + RewriteRule ^$ wiki.cgi [L] + </Directory> + Redirect /cgi-bin/myguide/ http://www.example.com/myguide/ + +You will of course need to make the appropriate substitutions for +your site. You also need to make sure that mod_rewrite is enabled in +your web server before adding such a configuration. The final step in +this URL tidying is to tell OpenGuides that the main CGI script can be +assumed to be called from the root of the install directory; do this by +setting the script name to be empty in wiki.conf: + + # what do you want the script to be called? + script_name = + +Currently the installation script does not support this value, so you will +have to make sure that you fix this up after an upgrade. + + +* Setup questions + +When you run the openguides-install script, it will check the current +directory to see if it can find a wiki.conf file. If it doesn't find one, +it will check that you want to continue with the installation. If you choose +yes, then a number of questions will follow; these are described below. + + + "Skip OpenGuides configuration?" + +Answer "n" to this question unless you really know what you're doing. +It's mainly there for developers. + + + "What type of database do you want the site to run on?" + +Options here are "postgres", "mysql", or "sqlite". If you choose an option +that you don't have the appropriate database driver for, then the script will +tell you this and exit. + + + "What's the full filename of the SQLite database this site runs on?" + +You will only be asked this question if you chose sqlite in the previous +question. Enter the full path, e.g. /home/kake/data.db, even if the file +is/will be in the current directory. You do not have to create this file +in advance; the setup process will do this for you. + + + "What's the name of the database that this site runs on?" + "...the database user that can access that database?" + "...the password that they use to access the database?" + "...the machine that the database is hosted on?" + +You will only be asked these questions if you chose mysql or postgres in +the question about the type of database. + +You should create (or ask your ISP/sysadmin to create) a database +specifically for your Guide. If you wish to run more than one Guide, then +each one will need its own database. The final two questions are optional. +If your database user doesn't need a password to access the database, then +just press RETURN to skip the question about passwords. Similarly, if the +database is running on a local machine with username/password +authentication then just press RETURN to skip the question about the +machine that the database is hosted on. If it is running on a local +machine with IDENT authentication then you may need to answer "localhost" +to this question. If it is running on a remote machine then enter the full +hostname of that machine. + + + "What do you want the script to be called?" + +The default is for the main script to be called "wiki.cgi", but +you may prefer to name it after your city - "leeds-guide.cgi" for +example. Note that your webserver may be configured to only allow +execution of scripts ending in, for example, ".cgi" + + + "What directory should I install it in?" + +You need to pick a directory for the OpenGuides software to be +installed in. This must be one known to the webserver as containing +CGI scripts. You will need to have write permission on this directory +when you come to run "perl Build install"; unless this is a private +directory belonging to you then this might require an 'su' or 'sudo' +to root under Unix. + + + "What directory should I install the templates in?" + "Where should I look for custom templates?" + +Normally these will be in the install directory, but they can be anywhere. +Custom templates are intended to be user-modified, so you might want to +put them somewhere in /etc. + + + "What URL does the install directory map to?" + +Give the full address needed to access the installation directory with +a web browser - for example http://london.openguides.org/ + + + "Do you want me to munge a custom lib path into the scripts?" + +If you have installed some or all of the required Perl modules (or indeed +the OpenGuides modules themselves) into a private directory, you will +need to tell the scripts where to find these modules. Enter the paths +to search here just as you would enter them in a 'use lib qw( ... );' +in a Perl script. + + + "Do you want to use Plucene for searching?" + +This question is no longer asked, but documentation here is retained for +the benefit of people upgrading. + +If you are changing to Plucene from Search::InvertedIndex, you will +need to do two things: + - either delete your old indexes (they're just files in the index + directory) or use a different index directory + - reindex your entire wiki (see reindex.pl in the examples/ + directory of this distribution) + + + "What directory can I use to store indexes in for searching?" + +You need a directory to store files used as indexes for the site. The +user that your script will run as will need write permission on this +directory. Under some webserver configurations this might be a +dedicated user - 'nobody' or 'www-data' for example, but for many +multi-user systems this will just be yourself. + + + "Do you want to enable page deletion?" + "Please specify a password for the site admin." + +The default is to disable page deletion. If you choose to enable the +page deletion mechanism then you will need to add a password to your +wiki.conf by answering the question above or manually using a line such as + admin_pass = putyourpasswordhere +Users who know this password will be able to delete unwanted pages - +along with all their history - from your wiki. +*** USE WITH CAUTION. DELETED PAGES CANNOT BE RECOVERED. *** + + + "What's the URL of the site's stylesheet?" + +Supplying an answer to this question is optional. There are example +stylesheets in the examples/ directory - note that these will not be +automatically installed. + + + "What's the wiki called?" + +This is a title which will appear at the top of every page. If you have +more than one OpenGuides installation at the same site then each should +have a unique name, since this name is used to manage user preferences. + + + "Do you want the navigation bar included on the home page?" + +Answer "y" or "n". + + + "Do you want the ten most recent changes included on the home page?" + +Answer "y" or "n". + + + "Do you want the Random Page link to avoid returning a locale page? + "Do you want the Random Page link to avoid returning a category page? + +Answer "y" or "n". The defaults are "n", which means that Random Page is as +likely to return a category or locale page as anything else. If the category +and locale pages on your Guide are generally just lists of things in that +category/locale, you probably want to pick "y" here. If, on the other hand, +your category/locale pages generally have substantial content of their own, +you may prefer to choose "n". + + + "Do you want the content to appear above the navbar in the HTML?" + +Answer "y" or "n". The default is "n", for reasons of backwards +compatibility with existing stylesheets, but the recommended answer is +"y", as this will help search engines to find the most relevant parts +of your pages. + + + "What should the home page of the wiki be called?" + "How would you describe the wiki?" + +Self-explanatory. + + + "What city is the wiki based in?" + "What country is the wiki based in?" + +If the wiki will not be city or country specific you can leave either or +both of these blank. + + + "Contact email address for the wiki admin?" + +Self explanatory. + + + "What language will the site be in? (Please give an ISO language code.)" + +eg "en" for English, "it" for Italian. +See http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt + + + "What's the name of the node or page to use for the text formatting + rules link?" + "What URL do you want to use for the text formatting rules" + +From 0.19, OpenGuides allows users to choose whether or not to have a +permanent link to the text formatting rules node or page in their navbar. +You need to put the name of that node or URL in here for it to work, though. +You might want to call the node "Text Formatting Examples", +"Text Formatting Rules", "House Style" or whatever. + +Note that these the latter question will override the former, so if you +want to use a local node make sure to leave the latter blank. + + "Make node titles link to node backlinks (C2 style)?" + +This refers to turning titles into links which bring up a list of referring +pages. This was the convention with older wikis ("C2" refers to the original +wiki at http://c2.com/cgi/wiki), but is not intuitive. + + "Do you have a Google Maps API key to use with this guide?" + +If you want Google Maps integration, you need to register with Google to get +an API key. Visit http://www.google.com/apis/maps/signup.html and follow the +instructions. Paste the great long string into the console window where you +are installing. See README.GMAPS for more information. + + "What is the longitude of the centre point of a map to draw for your guide?" + "What is the latitude of the centre point of a map to draw for your guide?" + +It's probably a good idea to pick some notionally central point for your +guide. For example, Carfax for Oxford, Charing Cross for London. As a +convenience, you may paste in a Google Maps URL for the centre longitude +question and the (long,lat) will be parsed out from the URL. + + "What default zoom level shall we use for Google Maps?" + "What default zoom level shall we use for Google Maps in the search results?" + +The defaults are probably appropriate in most cases. + + "Would you like to display a Google Map on every node that has geodata?" + +Answer "y" or "n". Note that an answer of "y" will only take effect if you've +supplied a Google Maps API key above. Note further that users can choose to +turn this off in their preferences. + + "Forcibly treat stored lat/long data as if they used the WGS84 ellipsoid?" + +Default this answer if you don't know what it means. + + "Do you have a Google Analytics key to use with this guide?" + +If you'd like to use Google Analytics to track the traffic on your guide, +visit http://www.google.com/analytics/ to sign up for a key. The answer to +this question is the string in quotes in the HTML fragment they ask you to +paste into your HTML, something along the lines of _uacct = "UA-1234567-1" +- it's the UA-1234567-1 part that you need to put in here. If you've +forgotten your key, go to Analytics Settings, click "Edit" under Settings, +then click "Check Status" in the top right-hand corner of the box with grey +stripes. + + + "What licence will you use for the guide?" + +We strongly recommend that you think at the outset about the licence your +guide will use, for maximum usefulness. In particular for a guide that will +be on the OpenGuides network, we recommend the +"Creative Commons Attribution-ShareAlike 2.5" licence. + + "What is the URL to your licence?" + +If you used our recommendation above the URL you will want here is: +http://creativecommons.org/licenses/by-sa/2.5/ + + "What is the URL to your local page about your licensing policy?" + +You should probably include a page on your wiki about your local licensing +policy, but you can leave this blank for now if you don't have one yet. + + "What module would you like to use for spam detection? (optional)" + +The module you choose should have a method called "looks_like_spam", which +accepts a hash with content and metadata as keys, and returns true or false +to the question of whether the edit should be considered to be spam. + + "What directory should we install static content (CSS, images, javascript) + to?" + +OpenGuides comes with some static content which will be installed +automatically. + + "What is the URL corresponding to the static content?" + +You will need to configure the above directory in your web server, then +input the URL the content will be visible at here. + + "Should we send email notifications when a moderated node is edited?" + +For spam avoidance, you can configure certain nodes to require moderation. +To ensure that such edits are noticed, OpenGuides can email you. + + "Distance calculation methods available are: + 1) British National Grid + 2) Irish National Grid + 3) UTM ellipsoid + Which would you like to use?" + + (and if you choose UTM ellipsoid) + "Which ellipsoid would you like to use? (eg 'Airy', 'WGS-84')" + +See http://www.vterrain.org/Projections/ for how this all works. +A UTM (Universal Transverse Mercator) ellipsoid maps latitude and +longitude to eastings and northings on a square grid, which allows +more accurate distance calculations within the guide. The British and +Irish National Grids are scaled and parametrised versions of UTM +ellipsoids (Airy 1830 in the British case, Modified Airy in the Irish). + +Please note that at the moment there is no provision for changing your +mind later about which ellipsoid to use, but it shouldn't be too hard +to write a conversion script so don't worry too much about picking the +wrong one. However do note that once you've entered some location +data you should not change this value in the config file without running +some kind of converter. + +If you decide to use the British or Irish National Grid, your users +will be able to choose between entering location data as lat/long +or as grid co-ordinates. + +You must have Geography::NationalGrid::GB installed to use the British +National Grid, Geography::NationalGrid::IE to use the Irish National +Grid, and Geo::Coordinates::UTM to use a UTM ellipsoid. + +If you want to use a UTM ellipsoid, WGS-84 is the best choice, as it +will allow you to use the Google Maps support with the minimum of fuss.

1 0

r1168 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 16 Jun '08

16 Jun '08

Author: earle Date: 2008-06-16 02:31:05 +0100 (Mon, 16 Jun 2008) New Revision: 1168 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt Log: Large RDF overhaul: see Changes for 0.63. Fixes #251. Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-06-15 20:02:45 UTC (rev 1167) +++ trunk/Changes 2008-06-16 01:31:05 UTC (rev 1168) @@ -4,8 +4,21 @@ <http://dev.openguides.org/log/trunk>. 0.63 - Link dc:contributor items in RDF output to actual URIs that exist in + Major overhaul of RDF output. + * Remodelled addresses using WAIL. + (http://www.eyrie.org/~zednenem/2002/wail/) + * Include node image as foaf:depiction. + * Link dc:contributor items in RDF output to actual URIs that exist in our system. + * Replace map XMLNS with dedicated vocabulary. + (http://downlode.org/Code/RDF/Map/) + * Replace usage of weakly-modeled and unavailable Wordnet vocabulary + for "neighborhood" value with WAIL term. + * Replace usage of unmodeled and unmaintained ChefMoz vocabulary for + opening hours value and replace with Dublin Core "available" term. + * Replace unnecessary instances of rdf:ID with rdf:nodeID. + * Model relationship of neighborhood to parent city. + * Reduce acres of whitespace in output and clean up indenting. 0.62 8 June 2008 Allow wiki page links (simple: [[Foo]], title: [[Foo|bar]]) in Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2008-06-15 20:02:45 UTC (rev 1167) +++ trunk/lib/OpenGuides/RDF.pm 2008-06-16 01:31:05 UTC (rev 1168) @@ -83,12 +83,11 @@ foreach my $var ( qw( phone fax website opening_hours_text address postcode city country latitude longitude - os_x os_y map_link summary ) ) { + os_x os_y map_link summary node_image ) ) { my $val = $metadata{$var}[0] || $defaults{$var} || ""; $tt_vars{$var} = $val; } - my @cats = @{ $metadata{category} || [] }; @cats = map { { name => $_ } } @cats; $tt_vars{categories} = \@cats; Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2008-06-15 20:02:45 UTC (rev 1167) +++ trunk/t/21_rdf.t 2008-06-16 01:31:05 UTC (rev 1168) @@ -15,7 +15,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 28; +plan tests => 29; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; @@ -75,21 +75,24 @@ latitude => "51.524193", longitude => "-0.114436", summary => "a nice pub", + node_image => "http://example.com/calthorpe.jpg", ); my $rdfxml = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms" ); like( $rdfxml, qr|<\?xml version="1.0"\?>|, "RDF is encoding-neutral" ); -like( $rdfxml, qr|<dc:title>Bloomsbury</dc:title>|, +like( $rdfxml, qr|<foaf:depiction rdf:resource="http://example.com/calthorpe.jpg" />|, "Node image"); + +like( $rdfxml, qr|<wail:Neighborhood rdf:nodeID="Bloomsbury">|, "finds the first locale" ); -like( $rdfxml, qr|<dc:title>St Pancras</dc:title>|, +like( $rdfxml, qr|<wail:Neighborhood rdf:nodeID="St_Pancras">|, "finds the second locale" ); -like( $rdfxml, qr|<phone>test phone number</phone>|, +like( $rdfxml, qr|<contact:phone>test phone number</contact:phone>|, "picks up phone number" ); -like( $rdfxml, qr|<chefmoz:Hours>test hours</chefmoz:Hours>|, +like( $rdfxml, qr|<dc:available>test hours</dc:available>|, "picks up opening hours text" ); like( $rdfxml, qr|<foaf:homepage rdf:resource="test website" />|, "picks up website" ); @@ -110,9 +113,9 @@ like( $rdfxml, qr|<dc:source rdf:resource="http://wiki.example.com/mywiki.cgi\?Calthorpe_Arms" />|, "set the dc:source with the version-independent uri" ); -like( $rdfxml, qr|<country>United Kingdom</country>|, "country" ). -like( $rdfxml, qr|<city>London</city>|, "city" ). -like( $rdfxml, qr|<postalCode>WC1X 8JR</postalCode>|, "postcode" ); +like( $rdfxml, qr|<wail:City rdf:nodeID="city">\n\s+<wail:name>London</wail:name>|, "city" ). +like( $rdfxml, qr|<wail:locatedIn>\n\s+<wail:Country rdf:nodeID="country">\n\s+<wail:name>United Kingdom</wail:name>|, "country" ). +like( $rdfxml, qr|<wail:postalCode>WC1X 8JR</wail:postalCode>|, "postcode" ); like( $rdfxml, qr|<geo:lat>51.524193</geo:lat>|, "latitude" ); like( $rdfxml, qr|<geo:long>-0.114436</geo:long>|, "longitude" ); like( $rdfxml, qr|<dc:description>a nice pub</dc:description>|, "summary (description)" ); @@ -169,6 +172,6 @@ $rdfxml = $rdf_writer->emit_rdfxml( node => "Nonesuch Stores" ); -like( $rdfxml, qr|<geo:SpatialThing rdf:ID="obj" dc:title="Nonesuch Stores">|, +like( $rdfxml, qr|<geo:SpatialThing rdf:ID="obj">|, "having opening hours marks node as geospatial" ); Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2008-06-15 20:02:45 UTC (rev 1167) +++ trunk/templates/node_rdf.tt 2008-06-16 01:31:05 UTC (rev 1168) @@ -1,108 +1,131 @@ <?xml version="1.0"?> <rdf:RDF - xmlns:chefmoz = "http://chefmoz.org/rdf/elements/1.0/" xmlns:dc = "http://purl.org/dc/elements/1.1/" xmlns:dcterms = "http://purl.org/dc/terms/" xmlns:foaf = "http://xmlns.com/foaf/0.1/" xmlns:geo = "http://www.w3.org/2003/01/geo/wgs84_pos#" - xmlns:map = "http://www.daml.org/2001/06/map/map-ont#" + xmlns:map = "http://downlode.org/Code/RDF/Map/" xmlns:os = "http://downlode.org/Code/RDF/Ordnance_Survey/schema/1#" xmlns:owl = "http://www.w3.org/2002/07/owl#" xmlns:rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:rdfs = "http://www.w3.org/2000/01/rdf-schema#" + xmlns:wail = "http://www.eyrie.org/~zednenem/2002/wail/" xmlns:wiki = "http://purl.org/rss/1.0/modules/wiki/" - xmlns:wn = "http://xmlns.com/wordnet/1.6/" - xmlns = "http://www.w3.org/2000/10/swap/pim/contact#" + xmlns:contact = "http://www.w3.org/2000/10/swap/pim/contact#" > - <rdf:Description rdf:about=""> - <dc:title>[% site_name %]: [% node_name %]</dc:title> - <dc:date>[% timestamp %]</dc:date> - <dcterms:modified>[% timestamp %]</dcterms:modified> +<rdf:Description rdf:about=""> + <dc:title>[% site_name %]: [% node_name %]</dc:title> + <dc:date>[% timestamp %]</dc:date> + <dcterms:modified>[% timestamp %]</dcterms:modified> - [% FOREACH contributor = contributors.values %] - <dc:contributor rdf:resource="[% full_cgi_url %]?id=[% contributor.user_id %];format=rdf#obj" foaf:name="[% contributor.user_id %]" /> - [% END %] + [%- FOREACH contributor = contributors.values %] + <dc:contributor rdf:resource="[% full_cgi_url %]?id=[% contributor.user_id %];format=rdf#obj" /> + [%- END %] - <dc:source rdf:resource="[% node_uri %]" /> - <wiki:version>[% version %]</wiki:version> - <foaf:topic rdf:resource="#obj" /> - </rdf:Description> + <dc:source rdf:resource="[% node_uri %]" /> + <wiki:version>[% version %]</wiki:version> + <foaf:topic rdf:resource="#obj" /> - <[% obj_type %] rdf:ID="obj" dc:title="[% node_name %]"> + [%- IF redirect %] + <owl:sameAs rdf:resource="[% redirect %]" /> + [%- END %] - [% IF summary %] - <dc:description>[% summary %]</dc:description> - [% END %] +</rdf:Description> - [% IF categories %] -  +<[% obj_type %] rdf:ID="obj"> - [% FOREACH category = categories %] - <dc:subject>[% category.name %]</dc:subject> - [% END %] - [% END %] + <dc:title>[% node_name %]</dc:title> + + [%- IF summary %] + <dc:description>[% summary %]</dc:description> + [%- END %] - [% IF is_geospatial %] -  + [%- IF node_image %] + <foaf:depiction rdf:resource="[% node_image %]" /> + [%- END %] - [% IF address %] - <address>[% address %]</address> - [% END %] - [% IF city %] - <city>[% city %]</city> - [% END %] - [% IF postcode %] - <postalCode>[% postcode %]</postalCode> - [% END %] - [% IF country %] - <country>[% country %]</country> - [% END %] + [%- IF categories %] +  - [% IF map_link %] - <foaf:page> - <map:Map rdf:about="[% map_link %]" /> - </foaf:page> - [% END %] + [%- FOREACH category = categories %] + <dc:subject>[% category.name %]</dc:subject> + [%- END %] + [%- END %] - [% FOREACH locale = locales %] - <foaf:based_near> - <wn:Neighborhood rdf:ID="[% locale.id %]"> - <dc:title>[% locale.name %]</dc:title> - </wn:Neighborhood> - </foaf:based_near> - [% END %] + [%- IF is_geospatial %] +  - [% IF wgs84_lat AND wgs84_long %] - <geo:lat>[% wgs84_lat %]</geo:lat> - <geo:long>[% wgs84_long %]</geo:long> - [% END %] + <wail:location> + <wail:Address rdf:nodeID="address"> + [%- IF address %] + <wail:streetName>[% address %]</wail:streetName> + [%- END %] + [%- IF postcode %] + <wail:postalCode>[% postcode %]</wail:postalCode> + [%- END %] + [%- IF city %] + <wail:locatedIn> + <wail:City rdf:nodeID="city"> + <wail:name>[% city %]</wail:name> + [%- IF country %] + <wail:locatedIn> + <wail:Country rdf:nodeID="country"> + <wail:name>[% country %]</wail:name> + </wail:Country> + </wail:locatedIn> + [%- END %] + </wail:City> + </wail:locatedIn> + [%- END %] + </wail:Address> + </wail:location> - [% IF os_x AND os_y %] - <os:x>[% os_x %]</os:x> - <os:y>[% os_y %]</os:y> - [% END %] + [%- IF map_link %] + <map:shownBy> + <map:Map rdf:about="[% map_link %]" /> + </map:shownBy> + [%- END %] - [% END %] + [%- FOREACH locale = locales %] + <foaf:based_near> + <wail:Neighborhood rdf:nodeID="[% locale.id %]"> + <wail:name>[% locale.name %]</wail:name> + [%- IF city %] + <wail:locatedIn rdf:nodeID="city" /> + [%- END %] + </wail:Neighborhood> + </foaf:based_near> + [%- END %] - [% IF phone OR fax OR website OR opening_hours_text %] -  - [% IF phone %] - <phone>[% phone %]</phone> - [% END %] - [% IF fax %] - <fax>[% fax %]</fax> - [% END %] - [% IF website %] - <foaf:homepage rdf:resource="[% website %]" /> - [% END %] - [% IF opening_hours_text %] - <chefmoz:Hours>[% opening_hours_text %]</chefmoz:Hours> - [% END %] - [% END %] + [%- IF wgs84_lat AND wgs84_long %] + <geo:lat>[% wgs84_lat %]</geo:lat> + <geo:long>[% wgs84_long %]</geo:long> + [%- END %] - [% IF redirect %] - <owl:sameAs rdf:resource="[% redirect %]" /> - [% END %] + [%- IF os_x AND os_y %] + <os:x>[% os_x %]</os:x> + <os:y>[% os_y %]</os:y> + [%- END %] - </[% obj_type %]> + [%- END %] + + [%- IF phone OR fax OR website OR opening_hours_text %] +  + [%- IF phone %] + <contact:phone>[% phone %]</contact:phone> + [%- END %] + [%- IF fax %] + <contact:fax>[% fax %]</contact:fax> + [%- END %] + [%- IF website %] + <foaf:homepage rdf:resource="[% website %]" /> + [%- END %] + [%- IF opening_hours_text %] + <dc:available>[% opening_hours_text %]</dc:available> + [%- END %] + [%- END %] + +</[% obj_type %]> + </rdf:RDF>

1 0

r1167 - trunk/templates
by svnadmin＠urchin.earth.li 15 Jun '08

15 Jun '08

Author: earle Date: 2008-06-15 21:02:45 +0100 (Sun, 15 Jun 2008) New Revision: 1167 Modified: trunk/templates/node_rdf.tt Log: Alphabetize and space out XML namespace declarations for maintainability's sake. Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2008-06-11 15:23:07 UTC (rev 1166) +++ trunk/templates/node_rdf.tt 2008-06-15 20:02:45 UTC (rev 1167) @@ -1,17 +1,17 @@ <?xml version="1.0"?> <rdf:RDF - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:dcterms="http://purl.org/dc/terms/" - xmlns:foaf="http://xmlns.com/foaf/0.1/" - xmlns:wiki="http://purl.org/rss/1.0/modules/wiki/" - xmlns:chefmoz="http://chefmoz.org/rdf/elements/1.0/" - xmlns:wn="http://xmlns.com/wordnet/1.6/" - xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" - xmlns:os="http://downlode.org/Code/RDF/Ordnance_Survey/schema/1#" - xmlns:owl="http://www.w3.org/2002/07/owl#" - xmlns:map="http://www.daml.org/2001/06/map/map-ont#" - xmlns="http://www.w3.org/2000/10/swap/pim/contact#" + xmlns:chefmoz = "http://chefmoz.org/rdf/elements/1.0/" + xmlns:dc = "http://purl.org/dc/elements/1.1/" + xmlns:dcterms = "http://purl.org/dc/terms/" + xmlns:foaf = "http://xmlns.com/foaf/0.1/" + xmlns:geo = "http://www.w3.org/2003/01/geo/wgs84_pos#" + xmlns:map = "http://www.daml.org/2001/06/map/map-ont#" + xmlns:os = "http://downlode.org/Code/RDF/Ordnance_Survey/schema/1#" + xmlns:owl = "http://www.w3.org/2002/07/owl#" + xmlns:rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:wiki = "http://purl.org/rss/1.0/modules/wiki/" + xmlns:wn = "http://xmlns.com/wordnet/1.6/" + xmlns = "http://www.w3.org/2000/10/swap/pim/contact#" > <rdf:Description rdf:about="">

1 0

r1166 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 11 Jun '08

11 Jun '08

Author: earle Date: 2008-06-11 16:23:07 +0100 (Wed, 11 Jun 2008) New Revision: 1166 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt Log: Link dc:contributor items in RDF output to actual URIs that exist in our system; closes #250. Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-06-07 23:37:44 UTC (rev 1165) +++ trunk/Changes 2008-06-11 15:23:07 UTC (rev 1166) @@ -3,6 +3,10 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. +0.63 + Link dc:contributor items in RDF output to actual URIs that exist in + our system. + 0.62 8 June 2008 Allow wiki page links (simple: [[Foo]], title: [[Foo|bar]]) in change summaries. Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2008-06-07 23:37:44 UTC (rev 1165) +++ trunk/lib/OpenGuides/RDF.pm 2008-06-11 15:23:07 UTC (rev 1166) @@ -182,6 +182,8 @@ my $tt = Template->new( { INCLUDE_PATH => "$custom_template_path:$template_path" } ); + $tt_vars{full_cgi_url} = $config->script_url . $config->script_name; + my $rdf; $tt->process( "node_rdf.tt", \%tt_vars, \$rdf ); $rdf ||= "ERROR: " . $tt->error; Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2008-06-07 23:37:44 UTC (rev 1165) +++ trunk/t/21_rdf.t 2008-06-11 15:23:07 UTC (rev 1166) @@ -98,9 +98,9 @@ qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); -like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, +like( $rdfxml, qr|id=Kake;format=rdf#obj"|, "last username to edit used as contributor" ); -like( $rdfxml, qr|<foaf:Person rdf:ID="Anonymous">|, +like( $rdfxml, qr|id=Anonymous;format=rdf#obj"|, "... as well as previous usernames" ); like( $rdfxml, qr|<wiki:version>2</wiki:version>|, "version picked up" ); Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2008-06-07 23:37:44 UTC (rev 1165) +++ trunk/templates/node_rdf.tt 2008-06-11 15:23:07 UTC (rev 1166) @@ -20,11 +20,7 @@ <dcterms:modified>[% timestamp %]</dcterms:modified> [% FOREACH contributor = contributors.values %] - <dc:contributor> - <foaf:Person rdf:ID="[% contributor.user_id %]"> - <foaf:nick>[% contributor.username %]</foaf:nick> - </foaf:Person> - </dc:contributor> + <dc:contributor rdf:resource="[% full_cgi_url %]?id=[% contributor.user_id %];format=rdf#obj" foaf:name="[% contributor.user_id %]" /> [% END %] <dc:source rdf:resource="[% node_uri %]" />

1 0

r1165 - tags
by svnadmin＠urchin.earth.li 08 Jun '08

08 Jun '08

Author: dom Date: 2008-06-08 00:37:44 +0100 (Sun, 08 Jun 2008) New Revision: 1165 Added: tags/rel0_62/ Log: tag release Copied: tags/rel0_62 (from rev 1164, trunk)

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits