Move lists of countries and library-types into their own new little

components, so they can be reused by find.mc

diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index d437ec0..ca1213a 100644 (file)
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,4 +1,4 @@
-%# $Id: edit.mc,v 1.28 2007-03-19 18:51:18 mike Exp $
+%# $Id: edit.mc,v 1.29 2007-03-29 16:19:39 mike Exp $
 <%args>
 $op
 $id => undef
@@ -79,248 +79,7 @@ my @fields =
     (
      [ title        => 0, "Name", "e:databaseInfo/e:title",
        qw() ],
-     [ country      => [
-                       "",
-                       "United States",
-                       "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",
-                       "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      => $m->comp("country-list.mc"),
        "Country", "i:status/i:country" ],
      [ protocol     => [ qw(Z39.50 SRW SRU SRW/U) ],
        "Protocol", "e:serverInfo/\@protocol" ],
@@ -328,7 +87,7 @@ my @fields =
      [ 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" ],
      [ username     => 0, "Username (if needed)", "e:serverInfo/e:authentication/e:user",
        qw() ],