X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fedit.mc;h=120859903c3758506c735a9a2d4c91bc68220818;hp=432bffc11a29f3696946287dfabf5e8f0c4fe388;hb=14d5be6edf2be05e728f4f497bfc0131f80ca224;hpb=17dd94e9befb4e2c697c0f0bf1c73b905be0e638 diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc index 432bffc..1208599 100644 --- a/web/htdocs/details/edit.mc +++ b/web/htdocs/details/edit.mc @@ -1,43 +1,339 @@ -%# $Id: edit.mc,v 1.15 2006-11-16 12:26:26 mike Exp $ +%# $Id: edit.mc,v 1.24 2006-12-06 10:37:23 mike Exp $ <%args> +$op $id => undef +$update => undef +<%doc> +Since this form is used in many different situations, some care is +merited in considering the possibilities: + +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 +---------------------------------------------------------------------- + +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. + <%perl> +# 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 $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0, - user => "admin", password => "fruitbat"); + user => "admin", password => "fruitbat", + elementSetName => "zeerex"); my $rec = ''; -if (defined $id && $id ne "") { - $conn->option(elementSetName => "zeerex"); - my $qid = $id; - $qid =~ s/"/\\"/g; - my $query = qq[rec.id="$qid"]; +if (defined $id && ($op ne "copy" || !$update)) { + # Existing record + my $query = 'rec.id="' . cql_quote($id) . '"'; my $rs = $conn->search(new ZOOM::Query::CQL($query)); - my $n = $rs->size(); - if ($n == 0) { + 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; + } + +} else { + # No ID supplied -- this is a brand 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 "") { + print qq[

+You must specify host, port and database name.

\n] if $update; + undef $update; } else { - $rec = $rs->record(0); + my $query = cql_target($host, $port, $dbname); + my $rs = $conn->search(new ZOOM::Query::CQL($query)); + if ($rs->size() > 0) { + my $fakeid = xml_encode(uri_escape("$host:$port/$dbname")); + print qq[

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

\n]; + undef $update; + } } } my $xc = irspy_xpath_context($rec); my @fields = ( + [ title => 0, "Name", "e:databaseInfo/e:title", + qw() ], + [ country => [ + "", + "Afghanistan", + "Albania", + "Algeria", + "American Samoa", + "Andorra", + "Angola", + "Anguilla", + "Antarctica", + "Antigua and Barbuda", + "Argentina", + "Armenia", + "Aruba", + "Australia", + "Austria", + "Azerbaijan", + "Bahamas", + "Bahrain", + "Bangladesh", + "Barbados", + "Belarus", + "Belgium", + "Belize", + "Benin", + "Bermuda", + "Bhutan", + "Bolivia", + "Bosnia and Herzegowina", + "Botswana", + "Bouvet Island", + "Brazil", + "British Indian Ocean Terr.", + "Brunei Darussalam", + "Bulgaria", + "Burkina Faso", + "Burundi", + "Cambodia", + "Cameroon", + "Canada", + "Cape Verde", + "Cayman Islands", + "Central African Republic", + "Chad", + "Chile", + "China", + "Christmas Island", + "Cocos (Keeling) Islands", + "Colombia", + "Comoros", + "Congo", + "Cook Islands", + "Costa Rica", + "Cote d'Ivoire", + "Croatia (Hrvatska)", + "Cuba", + "Cyprus", + "Czech Republic", + "Denmark", + "Djibouti", + "Dominica", + "Dominican Republic", + "East Timor", + "Ecuador", + "Egypt", + "El Salvador", + "Equatorial Guinea", + "Eritrea", + "Estonia", + "Ethiopia", + "Falkland Islands/Malvinas", + "Faroe Islands", + "Fiji", + "Finland", + "France", + "France, Metropolitan", + "French Guiana", + "French Polynesia", + "French Southern Terr.", + "Gabon", + "Gambia", + "Georgia", + "Germany", + "Ghana", + "Gibraltar", + "Greece", + "Greenland", + "Grenada", + "Guadeloupe", + "Guam", + "Guatemala", + "Guinea", + "Guinea-Bissau", + "Guyana", + "Haiti", + "Heard & McDonald Is.", + "Honduras", + "Hong Kong", + "Hungary", + "Iceland", + "India", + "Indonesia", + "Iran", + "Iraq", + "Ireland", + "Israel", + "Italy", + "Jamaica", + "Japan", + "Jordan", + "Kazakhstan", + "Kenya", + "Kiribati", + "Korea, North", + "Korea, South", + "Kuwait", + "Kyrgyzstan", + "Lao People's Dem. Rep.", + "Latvia", + "Lebanon", + "Lesotho", + "Liberia", + "Libyan Arab Jamahiriya", + "Liechtenstein", + "Lithuania", + "Luxembourg", + "Macau", + "Macedonia", + "Madagascar", + "Malawi", + "Malaysia", + "Maldives", + "Mali", + "Malta", + "Marshall Islands", + "Martinique", + "Mauritania", + "Mauritius", + "Mayotte", + "Mexico", + "Micronesia", + "Moldova", + "Monaco", + "Mongolia", + "Montserrat", + "Morocco", + "Mozambique", + "Myanmar", + "Namibia", + "Nauru", + "Nepal", + "Netherlands", + "Netherlands Antilles", + "New Caledonia", + "New Zealand", + "Nicaragua", + "Niger", + "Nigeria", + "Niue", + "Norfolk Island", + "Northern Mariana Is.", + "Norway", + "Oman", + "Pakistan", + "Palau", + "Panama", + "Papua New Guinea", + "Paraguay", + "Peru", + "Philippines", + "Pitcairn", + "Poland", + "Portugal", + "Puerto Rico", + "Qatar", + "Reunion", + "Romania", + "Russian Federation", + "Rwanda", + "S.Georgia & S.Sandwich Is.", + "Saint Kitts and Nevis", + "Saint Lucia", + "Samoa", + "San Marino", + "Sao Tome & Principe", + "Saudi Arabia", + "Senegal", + "Seychelles", + "Sierra Leone", + "Singapore", + "Slovakia (Slovak Republic)", + "Slovenia", + "Solomon Islands", + "Somalia", + "South Africa", + "Spain", + "Sri Lanka", + "St. Helena", + "St. Pierre & Miquelon", + "St. Vincent & Grenadines", + "Sudan", + "Suriname", + "Svalbard & Jan Mayen Is.", + "Swaziland", + "Sweden", + "Switzerland", + "Syrian Arab Republic", + "Taiwan", + "Tajikistan", + "Tanzania", + "Thailand", + "Togo", + "Tokelau", + "Tonga", + "Trinidad and Tobago", + "Tunisia", + "Turkey", + "Turkmenistan", + "Turks & Caicos Islands", + "Tuvalu", + "U.S. Minor Outlying Is.", + "Uganda", + "Ukraine", + "United Arab Emirates", + "United Kingdom", + "United States", + "Uruguay", + "Uzbekistan", + "Vanuatu", + "Vatican (Holy See)", + "Venezuela", + "Viet Nam", + "Virgin Islands (British)", + "Virgin Islands (U.S.)", + "Wallis & Futuna Is.", + "Western Sahara", + "Yemen", + "Yugoslavia", + "Zaire", + "Zambia", + "Zimbabwe", + ], + "Country", "i:status/i:country" ], [ protocol => [ qw(Z39.50 SRW SRU SRW/U) ], "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 => [ "", qw(Academic Public Corporate Special National Education Other) ], "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", @@ -57,29 +353,32 @@ my @fields = qw(e:title e:description) ], ); -my $nchanges = 0; -my $update = $r->param("update"); -if (defined $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); - } - - $nchanges = modify_xml_document($xc, \%fieldsByKey, \%data); - if ($nchanges) { - ### Set e:metaInfo/e:dateModified - } +# Update record with submitted data +my %fieldsByKey = map { ( $_->[0], $_) } @fields; +my %data; +foreach my $key ($r->param()) { + next if grep { $key eq $_ } qw(op id update); + $data{$key} = $r->param($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::_really_rewrite_record($conn, $xc->getContextNode()); } +

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

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

- The record has been <% $r->param("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) %>.

% }
@@ -91,38 +390,40 @@ 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" &> + % } + % if (defined $id) { -% } else { - % }
<%perl> - if ($nchanges && 0) { + if (@changedFields && 0) { my $x = $xc->getContextNode()->toString(); $x = xml_encode($x); #$x =~ s/$//gm;