X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=881b5ce3c4a4e4ca55f271eb3e24e1e9906c921c;hp=1d789f0655d32243c2513428d59e5a9c50a1c287;hb=fa618fabcabbfe6a4b6c7ac4ff9e64676a82ddf2;hpb=b19957eea1512557c2c130c51b59d5f9bbb4c5f0 diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc index 1d789f0..881b5ce 100644 --- a/web/htdocs/details/edit.mc +++ b/web/htdocs/details/edit.mc @@ -1,84 +1,132 @@ -%# $Id: edit.mc,v 1.20 2006-11-17 22:39:17 mike Exp $ +<%args> +$op +$id => undef ### should be extracted using utf8param() +$update => undef + <%doc> Since this form is used in many different situations, some care is merited in considering the possibilities: -New? Copy ID? Situation --------------------------------------------------------------------------- -Y Blank form for adding a new target. -Y New target submitted successfully. -Y Partial new target submitted, requiring more - - Y Existing target to be edited. - Y Existing target has been updated. +Situation Op ID Update +---------------------------------------------------------------------- +Blank form for adding a new target new +New target rejected, changes required new X +New target accepted and added new X +--------------------------------------------------------------------- +Existing target to be edited edit X +Edit rejected, changes required edit X X +Target successfully updated edit X X +---------------------------------------------------------------------- +Existing target to be copied copy X +New target rejected, changes required copy X X +New target accepted and added copy X X +---------------------------------------------------------------------- - Y Y Existing target to be copied. - Y New or copied target rejected due to duplicate ID. --------------------------------------------------------------------------- +Submissions, whether of new targets, edits or copies, may be rejected +due either to missing mandatory fields or host/name/port that form a +duplicate ID. -<%args> -$new => undef -$copy => undef -$id => undef - <%perl> -my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0, +# Sanity checking +die "op = new but id defined" if $op eq "new" && defined $id; +die "op != new but id undefined" if $op ne "new" && !defined $id; + +my $db = ZOOM::IRSpy::connect_to_registry(); +my $conn = new ZOOM::Connection($db, 0, user => "admin", password => "fruitbat", elementSetName => "zeerex"); + +my $protocol = utf8paramTrim($r, "protocol"); +my $host = utf8paramTrim($r, "host"); +my $port = utf8paramTrim($r, "port"); +my $dbname = utf8paramTrim($r, "dbname"); +my $title = utf8paramTrim($r, "title"); + +if ((!defined $port || $port eq "") && + (defined $protocol && $protocol ne "")) { + # Port-guessing based on defaults for each protocol + $port = $protocol eq "Z39.50" ? 210 : 80; + warn "guessed port $port"; + &utf8param($r, port => $port); +} + +my $newid; +if (defined $protocol && $protocol ne "" && + defined $host && $host ne "" && + defined $port && $port ne "" && + defined $title && $title ne "" && + defined $dbname && $dbname ne "") { + $newid = irspy_make_identifier($protocol, $host, $port, $dbname); +} + my $rec = ''; -if (defined $id && $id ne "") { - # Existing record - my $query = 'rec.id="' . cql_quote($id) . '"'; - my $rs = $conn->search(new ZOOM::Query::CQL($query)); - if ($rs->size() > 0) { - $rec = $rs->record(0); - } else { - $id = undef; - } -} else { - # New record - my $host = $r->param("host"); - my $port = $r->param("port"); - my $dbname = $r->param("dbname"); - if (!defined $host || $host eq "" || - !defined $port || $port eq "" || - !defined $dbname || $dbname eq "") { +if (!defined $id) { + if (!$update) { + # About to enter data for a new record + # Nothing to do at this stage + } elsif (!defined $newid) { + # Tried to create new record but data is insufficient + print qq[

+ Please specify title, protocol, host, port and database name.

\n]; + undef $update; + } elsif ($host !~ /^\w+\.[\w.]*\w$/i) { + print qq[

+ This host name is not valid.

\n]; + undef $update; + sleep 25; + } elsif ($port !~ /^\d*$/i) { print qq[

-You must specify host, port and database name.

\n]; - $r->param(update => 0); + This port number is not valid.

\n]; + undef $update; + sleep 25; } else { - my $query = cql_target($host, $port, $dbname); - my $rs = $conn->search(new ZOOM::Query::CQL($query)); + # Creating new record, all necessary data is present. Check + # that the new record is not a duplicate of an existing one. + my $rs = $conn->search(new ZOOM::Query::CQL(cql_target($newid))); if ($rs->size() > 0) { - my $fakeid = xml_encode(uri_escape("$host:$port/$dbname")); + my $qnewid = xml_encode(uri_escape_utf8($newid)); print qq[

-There is already -a record -for this host, port and database name. -

\n]; + There is already + a record + for this protocol, host, port and database name. +

\n]; + undef $update; } } +} else { + # assert(defined $id); + # Copying or editing an existing record: fetch it for editing + my $query = cql_target($id); + my $rs = $conn->search(new ZOOM::Query::CQL($query)); + if ($rs->size() > 0) { + $rec = $rs->record(0); + } else { + ### Is this an error? I don't think the UI will ever provoke it + print qq[

(New ID specified.)

\n]; + $id = undef; + } } my $xc = irspy_xpath_context($rec); my @fields = ( - [ protocol => [ qw(Z39.50 SRW SRU SRW/U) ], + [ title => 0, "Name", "e:databaseInfo/e:title", + qw() ], + [ country => $m->comp("country-list.mc"), + "Country", "i:status/i:country" ], + [ protocol => [ qw(Z39.50 SRW SRU) ], "Protocol", "e:serverInfo/\@protocol" ], [ host => 0, "Host", "e:serverInfo/e:host" ], [ port => 0, "Port", "e:serverInfo/e:port" ], [ dbname => 0, "Database Name", "e:serverInfo/e:database", qw(e:host e:port) ], - [ type => [ qw(Academic Public Corporate Special National Education Other) ], + [ type => $m->comp("libtype-list.mc"), "Type of Library", "i:status/i:libraryType" ], - [ country => 0, "Country", "i:status/i:country" ], [ username => 0, "Username (if needed)", "e:serverInfo/e:authentication/e:user", qw() ], [ password => 0, "Password (if needed)", "e:serverInfo/e:authentication/e:password", qw(e:user) ], - [ title => 0, "Title", "e:databaseInfo/e:title", - qw() ], [ description => 5, "Description", "e:databaseInfo/e:description", qw(e:title) ], [ author => 0, "Author", "e:databaseInfo/e:author", @@ -90,7 +138,200 @@ my @fields = qw(e:title e:description) ], [ history => 5, "History", "e:databaseInfo/e:history", qw(e:title e:description) ], - [ language => 0, "Language of Records", "e:databaseInfo/e:langUsage", + [ language => [ +# This list was produced by feeding +# http://www.loc.gov/standards/iso639-2/ISO-639-2_values_8bits.txt +# through the filter +# awk -F'|' '$3 {print$4}' +# and shortening some of the longer names by hand + "", + "English", + "Afar", + "Abkhazian", + "Afrikaans", + "Akan", + "Albanian", + "Amharic", + "Arabic", + "Aragonese", + "Armenian", + "Assamese", + "Avaric", + "Avestan", + "Aymara", + "Azerbaijani", + "Bashkir", + "Bambara", + "Basque", + "Belarusian", + "Bengali", + "Bihari", + "Bislama", + "Bosnian", + "Breton", + "Bulgarian", + "Burmese", + "Catalan; Valencian", + "Chamorro", + "Chechen", + "Chinese", + "Church Slavic; Old Slavonic", + "Chuvash", + "Cornish", + "Corsican", + "Cree", + "Czech", + "Danish", + "Divehi; Dhivehi; Maldivian", + "Dutch; Flemish", + "Dzongkha", + "Esperanto", + "Estonian", + "Ewe", + "Faroese", + "Fijian", + "Finnish", + "French", + "Western Frisian", + "Fulah", + "Georgian", + "German", + "Gaelic; Scottish Gaelic", + "Irish", + "Galician", + "Manx", + "Greek, Modern (1453-)", + "Guarani", + "Gujarati", + "Haitian; Haitian Creole", + "Hausa", + "Hebrew", + "Herero", + "Hindi", + "Hiri Motu", + "Hungarian", + "Igbo", + "Icelandic", + "Ido", + "Sichuan Yi", + "Inuktitut", + "Interlingue", + "Interlingua", + "Indonesian", + "Inupiaq", + "Italian", + "Javanese", + "Japanese", + "Kalaallisut; Greenlandic", + "Kannada", + "Kashmiri", + "Kanuri", + "Kazakh", + "Khmer", + "Kikuyu; Gikuyu", + "Kinyarwanda", + "Kirghiz", + "Komi", + "Kongo", + "Korean", + "Kuanyama; Kwanyama", + "Kurdish", + "Lao", + "Latin", + "Latvian", + "Limburgan; Limburger; Limburgish", + "Lingala", + "Lithuanian", + "Luxembourgish; Letzeburgesch", + "Luba-Katanga", + "Ganda", + "Macedonian", + "Marshallese", + "Malayalam", + "Maori", + "Marathi", + "Malay", + "Malagasy", + "Maltese", + "Moldavian", + "Mongolian", + "Nauru", + "Navajo; Navaho", + "Ndebele, South; South Ndebele", + "Ndebele, North; North Ndebele", + "Ndonga", + "Nepali", + "Norwegian Nynorsk", + "Norwegian Bokmål", + "Norwegian", + "Chichewa; Chewa; Nyanja", + "Occitan (post 1500); Provençal", + "Ojibwa", + "Oriya", + "Oromo", + "Ossetian; Ossetic", + "Panjabi; Punjabi", + "Persian", + "Pali", + "Polish", + "Portuguese", + "Pushto", + "Quechua", + "Raeto-Romance", + "Romanian", + "Rundi", + "Russian", + "Sango", + "Sanskrit", + "Serbian", + "Croatian", + "Sinhala; Sinhalese", + "Slovak", + "Slovenian", + "Northern Sami", + "Samoan", + "Shona", + "Sindhi", + "Somali", + "Sotho, Southern", + "Spanish; Castilian", + "Sardinian", + "Swati", + "Sundanese", + "Swahili", + "Swedish", + "Tahitian", + "Tamil", + "Tatar", + "Telugu", + "Tajik", + "Tagalog", + "Thai", + "Tibetan", + "Tigrinya", + "Tonga (Tonga Islands)", + "Tswana", + "Tsonga", + "Turkmen", + "Turkish", + "Twi", + "Uighur; Uyghur", + "Ukrainian", + "Urdu", + "Uzbek", + "Venda", + "Vietnamese", + "Volapük", + "Welsh", + "Walloon", + "Wolof", + "Xhosa", + "Yiddish", + "Yoruba", + "Zhuang; Chuang", + "Zulu", + ], + "Language of Records", "e:databaseInfo/e:langUsage", qw(e:title e:description) ], [ restrictions => 2, "Restrictions", "e:databaseInfo/e:restrictions", qw(e:title e:description) ], @@ -98,33 +339,42 @@ my @fields = qw(e:title e:description) ], ); -my $nchanges = 0; -my $update = $r->param("update"); - - # Update record with submitted data - my %fieldsByKey = map { ( $_->[0], $_) } @fields; - my %data; - foreach my $key ($r->param()) { - next if grep { $key eq $_ } qw(id update new copy); - $data{$key} = $r->param($key); - } - my $mynchanges = modify_xml_document($xc, \%fieldsByKey, \%data); - -if ($update) { - $nchanges = $mynchanges; - if ($nchanges) { - ### Set e:metaInfo/e:dateModified - } - ZOOM::IRSpy::_really_rewrite_record($conn, $xc->getContextNode()); +# Update record with submitted data +my %fieldsByKey = map { ( $_->[0], $_) } @fields; +my %data; +foreach my $key (&utf8param($r)) { + next if grep { $key eq $_ } qw(op id update); + $data{$key} = trimField( utf8param($r, $key) ); } +my @changedFields = modify_xml_document($xc, \%fieldsByKey, \%data); +if ($update && @changedFields) { + my @x = modify_xml_document($xc, { dateModified => + [ dateModified => 0, + "Data/time modified", + "e:metaInfo/e:dateModified" ] }, + { dateModified => isodate(time()) }); + die "Didn't set dateModified!" if !@x; + ZOOM::IRSpy::_rewrite_zeerex_record($conn, $xc->getContextNode(), + $op eq "edit" ? $id : undef); +} +

<% xml_encode($xc->find("e:databaseInfo/e:title"), "[Untitled]") %>

-% if ($nchanges) { +% if ($update && @changedFields) { +% my $nchanges = @changedFields;

- The record has been <% $new ? "created" : "updated" %>.
- Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>. + The record has been <% $op ne "edit" ? "created" : "updated" %>.
+ Changed <% $nchanges %> field<% $nchanges == 1 ? "" : "s" %>: + <% join(", ", map { xml_encode($_->[2]) } @changedFields) %>.

+% return if $op eq "new"; % } +

+ Although anyone is allowed to add a new target, please note that + you will not be able to edit the newly added target unless you + have administrator privileges. So please be sure that the + details are correct before submitting them. +

<%perl> @@ -134,41 +384,42 @@ foreach my $ref (@fields) { + % }
<% $caption %> -% my $rawdata = $xc->findvalue($xpath); -% my $data = xml_encode($rawdata, ""); +% my $rawval = $xc->findvalue($xpath); +% my $val = xml_encode($rawval, ""); % if (ref $nlines) { % } elsif ($nlines) { - + % } else { - + % } + <& /help/link.mc, help => "edit/$name" &> +
+% $op = "edit" if $op eq "new" && defined $update; + +% $id = $newid if defined $newid; % if (defined $id) { -% } else { - -% } -% if (defined $copy) { - % }
<%perl> - if ($nchanges && 0) { + if (@changedFields && 0) { my $x = $xc->getContextNode()->toString(); $x = xml_encode($x); #$x =~ s/$//gm;