Switch to unified view

a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp
1
#ifndef lint
1
#ifndef lint
2
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.122 2007-07-12 17:28:11 dockes Exp $ (C) 2004 J.F.Dockes";
2
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.123 2007-09-07 08:05:19 dockes Exp $ (C) 2004 J.F.Dockes";
3
#endif
3
#endif
4
/*
4
/*
5
 *   This program is free software; you can redistribute it and/or modify
5
 *   This program is free software; you can redistribute it and/or modify
6
 *   it under the terms of the GNU General Public License as published by
6
 *   it under the terms of the GNU General Public License as published by
7
 *   the Free Software Foundation; either version 2 of the License, or
7
 *   the Free Software Foundation; either version 2 of the License, or
...
...
177
        // Can't use reOpen here, it would delete *me*
177
        // Can't use reOpen here, it would delete *me*
178
        db = Xapian::Database(m_db->m_basedir);
178
        db = Xapian::Database(m_db->m_basedir);
179
    } catch (const Xapian::Error &e) {
179
    } catch (const Xapian::Error &e) {
180
        ermsg = e.get_msg().c_str();
180
        ermsg = e.get_msg().c_str();
181
        break;
181
        break;
182
  } catch (const string &s) {
183
      ermsg = s;
184
      if (ermsg.empty()) 
185
      ermsg = "Empty error message"; 
186
  } catch (const char *s) {
187
      ermsg = s ? s : "";
188
      if (ermsg.empty()) 
189
      ermsg = "Empty error message"; 
182
    } catch (...) {
190
    } catch (...) {
183
      ermsg= "Unknown error";
191
      ermsg= "Unknown xapian error (not Xapian::Error or string)";
184
        break;
192
        break;
185
    }
193
    }
186
    }
194
    }
187
    LOGERR(("Rcl::Db::subDocs: %s\n", ermsg.c_str()));
195
    LOGERR(("Rcl::Db::subDocs: %s\n", ermsg.c_str()));
188
    return false;
196
    return false;