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
Added core mime types
[yazproxy-moved-to-github.git]
/
src
/
yaz-proxy.cpp
diff --git
a/src/yaz-proxy.cpp
b/src/yaz-proxy.cpp
index
935e453
..
1c655b5
100644
(file)
--- a/
src/yaz-proxy.cpp
+++ b/
src/yaz-proxy.cpp
@@
-1,5
+1,5
@@
-/* $Id: yaz-proxy.cpp,v 1.14 2004-12-13 20:52:33 adam Exp $
- Copyright (c) 1998-2004, Index Data.
+/* $Id: yaz-proxy.cpp,v 1.17 2005-01-11 20:58:04 adam Exp $
+ Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
This file is part of the yaz-proxy.
@@
-19,18
+19,21
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-#ifdef WIN32
-#else
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <unistd.h>
#endif
-
-#if HAVE_GETTIMEOFDAY
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <sys/time.h>
#endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
#include <assert.h>
#include <time.h>
#include <assert.h>
#include <time.h>
-#include <sys/types.h>
#include <fcntl.h>
#include <yaz/srw.h>
#include <fcntl.h>
#include <yaz/srw.h>
@@
-688,8
+691,8
@@
int Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p, Z_APDU *apdu)
void Yaz_Proxy::convert_xsl_delay()
{
void Yaz_Proxy::convert_xsl_delay()
{
- Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset];
#if HAVE_XSLT
#if HAVE_XSLT
+ Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset];
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
Z_External *r = npr->u.databaseRecord;
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
Z_External *r = npr->u.databaseRecord;
@@
-2391,7
+2394,7
@@
void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
// delete other info construct completely if 0 elements
get_otherInfoAPDU(apdu, &oi);
// delete other info construct completely if 0 elements
get_otherInfoAPDU(apdu, &oi);
- if (*oi && (*oi)->num_elements == 0)
+ if (oi && *oi && (*oi)->num_elements == 0)
*oi = 0;
if (apdu->which == Z_APDU_presentRequest &&
*oi = 0;
if (apdu->which == Z_APDU_presentRequest &&