I hate failed merges

[pazpar2-moved-to-github.git] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index fac727b..2b1c3d3 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 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
@@ -398,16 +398,7 @@ static int connection_connect(struct connection *con)
     if (sru && *sru)
         strcpy(ipport, "http://");
     strcat(ipport, host->ipport);
-    /* deal with SRU path here because databaseName option is not read in
-       ZOOM in SRU mode */
-    if (sru && *sru)
-    {
-        if (*sdb->database->databases[0])
-        {
-            strcat(ipport, "/");
-            strcat(ipport, sdb->database->databases[0]);
-        }
-    }
+
     ZOOM_connection_connect(link, ipport, 0);
     
     con->link = link;
@@ -488,7 +479,9 @@ int client_prep_connection(struct client *cl)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+