X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconfig.c;h=f02d169507288020bb3c50eda744aaef1aa0238e;hb=90dcde08cb73241173e22e84362c6acf9ee92276;hp=359738f79963eb0ac14bd26590716052971f913f;hpb=d7dc14dcdfbd1ecdc805a0d649203f3b9888749c;p=pazpar2-moved-to-github.git

diff --git a/src/config.c b/src/config.c
index 359738f..f02d169 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,7 +1,5 @@
-/* $Id: config.c,v 1.41 2007-09-10 16:25:50 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,12 +12,12 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
-/* $Id: config.c,v 1.41 2007-09-10 16:25:50 adam Exp $ */
+/* $Id: config.c,v 1.42 2007-10-31 05:29:08 quinn Exp $ */
 
 #include <string.h>
 
@@ -63,11 +61,7 @@ struct conf_metadata * conf_metadata_assign(NMEM nmem,
     
     metadata->name = nmem_strdup(nmem, name);
 
-    // enforcing that merge_range is always type_year 
-    if (merge == Metadata_merge_range)
-        metadata->type = Metadata_type_year;
-    else
-        metadata->type = type;
+    metadata->type = type;
 
     // enforcing that type_year is always range_merge
     if (metadata->type == Metadata_type_year)
@@ -299,6 +293,8 @@ static struct conf_service *parse_service(xmlNode *node)
                     type = Metadata_type_generic;
                 else if (!strcmp((const char *) xml_type, "year"))
                     type = Metadata_type_year;
+                else if (!strcmp((const char *) xml_type, "date"))
+                    type = Metadata_type_date;
                 else
                 {
                     yaz_log(YLOG_FATAL, 
@@ -460,13 +456,6 @@ static struct conf_server *parse_server(xmlNode *node)
                 server->proxy_host = nmem_strdup(nmem, (const char *) host);
             if (myurl)
                 server->myurl = nmem_strdup(nmem, (const char *) myurl);
-#ifdef GAGA
-            else
-            {
-                yaz_log(YLOG_FATAL, "Must specify @myurl for proxy");
-                return 0;
-            }
-#endif
             xmlFree(port);
             xmlFree(host);
             xmlFree(myurl);