version 1.372, 2007/03/08 11:40:33
|
version 1.373, 2007/10/18 08:59:21
|
Line 283 AHTDocId_Status *GetDocIdStatus (int
|
Line 283 AHTDocId_Status *GetDocIdStatus (int
|
AHTGuessAtom_for |
AHTGuessAtom_for |
Converts an Amaya type descriptor into the equivalent MIME type. |
Converts an Amaya type descriptor into the equivalent MIME type. |
----------------------------------------------------------------------*/ |
----------------------------------------------------------------------*/ |
static HTAtom *AHTGuessAtom_for (char *urlName, char *contentType) |
static HTAtom *AHTGuessAtom_for (char *urlName, const char *contentType) |
{ |
{ |
HTAtom *atom; |
HTAtom *atom; |
char * filename; |
char * filename; |
Line 3407 int GetObjectWWW (int docid, int refdoc,
|
Line 3407 int GetObjectWWW (int docid, int refdoc,
|
HT_OK |
HT_OK |
----------------------------------------------------------------------*/ |
----------------------------------------------------------------------*/ |
int PutObjectWWW (int docid, char *fileName, char *urlName, |
int PutObjectWWW (int docid, char *fileName, char *urlName, |
char *contentType, char *outputfile, int mode, |
const char *contentType, char *outputfile, int mode, |
TTcbf *terminate_cbf, void *context_tcbf) |
TTcbf *terminate_cbf, void *context_tcbf) |
{ |
{ |
AHTReqContext *me; |
AHTReqContext *me; |
Line 3417 int PutObjectWWW (int docid, char *fileN
|
Line 3417 int PutObjectWWW (int docid, char *fileN
|
char *fileURL; |
char *fileURL; |
char *etag = NULL; |
char *etag = NULL; |
HTParentAnchor *dest_anc_parent; |
HTParentAnchor *dest_anc_parent; |
char *tmp; |
|
char *esc_url; |
char *esc_url; |
int UsePreconditions; |
int UsePreconditions; |
char url_name[MAX_LENGTH]; |
char url_name[MAX_LENGTH]; |
Line 3436 int PutObjectWWW (int docid, char *fileN
|
Line 3435 int PutObjectWWW (int docid, char *fileN
|
else |
else |
{ |
{ |
/* should we protect the PUT against lost updates? */ |
/* should we protect the PUT against lost updates? */ |
tmp = TtaGetEnvString ("ENABLE_LOST_UPDATE_CHECK"); |
const char *tmp = TtaGetEnvString ("ENABLE_LOST_UPDATE_CHECK"); |
if (tmp && *tmp && strcasecmp (tmp, "yes")) |
if (tmp && *tmp && strcasecmp (tmp, "yes")) |
lost_update_check = FALSE; |
lost_update_check = FALSE; |
|
|
Line 3490 int PutObjectWWW (int docid, char *fileN
|
Line 3489 int PutObjectWWW (int docid, char *fileN
|
/* prepare the target URL */ |
/* prepare the target URL */ |
if (resource_name) |
if (resource_name) |
{ |
{ |
tmp = strstr (urlName, resource_name); |
char *tmp = strstr (urlName, resource_name); |
if (!tmp) |
if (!tmp) |
{ |
{ |
/* urlName does not include the resource name */ |
/* urlName does not include the resource name */ |
Line 3623 int PutObjectWWW (int docid, char *fileN
|
Line 3622 int PutObjectWWW (int docid, char *fileN
|
charset = TtaGetDocumentCharset (docid); |
charset = TtaGetDocumentCharset (docid); |
if (charset != UNDEFINED_CHARSET) |
if (charset != UNDEFINED_CHARSET) |
{ |
{ |
tmp = TtaGetCharsetName (charset); |
const char *tmp = TtaGetCharsetName (charset); |
if (tmp && *tmp != EOS) |
if (tmp && *tmp != EOS) |
{ |
{ |
tmp2 = TtaStrdup (tmp); |
tmp2 = TtaStrdup (tmp); |