projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle submodules.
[yazproxy-moved-to-github.git]
/
src
/
yaz-proxy.cpp
diff --git
a/src/yaz-proxy.cpp
b/src/yaz-proxy.cpp
index
6b04f38
..
258c5b4
100644
(file)
--- a/
src/yaz-proxy.cpp
+++ b/
src/yaz-proxy.cpp
@@
-1,4
+1,4
@@
-/* $Id: yaz-proxy.cpp,v 1.75 2007-04-30 19:46:34 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.78 2008-02-21 09:33:23 adam Exp $
Copyright (c) 1998-2007, Index Data.
This file is part of the yazproxy.
Copyright (c) 1998-2007, Index Data.
This file is part of the yazproxy.
@@
-399,7
+399,6
@@
Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure()
if (m_reconfig_flag)
{
yaz_log(YLOG_LOG, "reconfigure");
if (m_reconfig_flag)
{
yaz_log(YLOG_LOG, "reconfigure");
- yaz_log_reopen();
if (m_config_fname && cfg)
{
yaz_log(YLOG_LOG, "reconfigure config %s", m_config_fname);
if (m_config_fname && cfg)
{
yaz_log(YLOG_LOG, "reconfigure config %s", m_config_fname);
@@
-487,7
+486,7
@@
char *Yaz_Proxy::get_cookie(Z_OtherInformation **otherInfo)
Z_OtherInformationUnit *oi =
update_otherInformation(otherInfo, 0, yaz_oid_userinfo_cookie, 1, 1);
Z_OtherInformationUnit *oi =
update_otherInformation(otherInfo, 0, yaz_oid_userinfo_cookie, 1, 1);
- if (oi->which == Z_OtherInfo_characterInfo)
+ if (oi && oi->which == Z_OtherInfo_characterInfo)
return oi->information.characterInfo;
return 0;
}
return oi->information.characterInfo;
return 0;
}
@@
-497,7
+496,7
@@
char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo)
Z_OtherInformationUnit *oi =
update_otherInformation(otherInfo, 0, yaz_oid_userinfo_proxy, 1, 1);
Z_OtherInformationUnit *oi =
update_otherInformation(otherInfo, 0, yaz_oid_userinfo_proxy, 1, 1);
- if (oi->which == Z_OtherInfo_characterInfo)
+ if (oi && oi->which == Z_OtherInfo_characterInfo)
return oi->information.characterInfo;
return 0;
}
return oi->information.characterInfo;
return 0;
}
@@
-1011,7
+1010,7
@@
void Yaz_Proxy::convert_records_charset(Z_NamePlusRecordList *p,
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
Z_External *r = npr->u.databaseRecord;
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
Z_External *r = npr->u.databaseRecord;
- const int *oid = r->direct_reference;
+ const Odr_oid *oid = r->direct_reference;
if (!oid)
continue;
if (!oid)
continue;