Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 05:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Additional changes for supporting HT_LayoutComplete().

Browse Source
This commit is contained in:
rjc%netscape.com 1998-09-15 22:07:34 +00:00
parent d7e99fe53e
commit a529b0e6d9
5 changed files with 82 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/macfe/projects/client/Navigator.exp
View File

@ -2296,7 +2296,7 @@ NET_UnEscape
# PA_CloneMDLTag
# PA_DropDocData
# PA_FetchAllNameValues
# PA_FetchParamValue
PA_FetchParamValue
# PA_FetchRequestedNameValues
# PA_FreeOverflow
# PA_FreeTag

2
lib/layout/layout.c
View File

@ -3881,7 +3881,7 @@ lo_FinishLayout(MWContext *context, lo_DocState *state, int32 mocha_event)
if (top_state && top_state->metaTags)
{
/* Tell RDF HT code that layout of the current document is complete */
HT_LayoutComplete( top_state->metaTags, top_state->url );
HT_LayoutComplete( context, top_state->metaTags, top_state->url );
/* Free the meta tag list */
lo_FreeTagList( top_state->metaTags );

3
modules/rdf/include/htrdf.h
View File

@ -30,6 +30,7 @@
#include "ntypes.h"
#include "structs.h"
#include "pa_parse.h"
/*
* Hyper Tree Api
@ -218,7 +219,7 @@ PR_PUBLIC_API(void) HT_SetPaneFEData (HT_Pane pane, void* data);
PR_PUBLIC_API(HT_View) HT_GetSelectedView (HT_Pane pane);
PR_PUBLIC_API(HT_Error) HT_SetSelectedView (HT_Pane pane, HT_View view);
PR_PUBLIC_API(void) HT_LayoutComplete(TagList *metaTags, char *url);
PR_PUBLIC_API(void) HT_LayoutComplete(MWContext *context, TagList *metaTags, char *url);
enum _HT_ViewType {
HT_VIEW_BOOKMARK=0, HT_VIEW_HISTORY, HT_VIEW_SITEMAP, HT_VIEW_FILES, HT_VIEW_SEARCH

88
modules/rdf/src/ht.c
View File

@ -25,13 +25,13 @@
#include "fs2rdf.h"
#include "glue.h"
#include "hist2rdf.h"
#include "ht.h"
#include "mcf.h"
#include "scook.h"
#include "utils.h"
#include "rdf.h"
#include "rdfparse.h"
#include "remstore.h"
#include "ht.h"
/* globals */
@ -1470,27 +1470,90 @@ HT_AddToContainer (HT_Resource container, char *url, char *optionalTitle)
}
htSetBookmarkAddDateToNow(r);
RDF_Assert(db, r, gCoreVocab->RDF_parent, container->node, RDF_RESOURCE_TYPE);
htLookInCacheForMetaTags(url);
/* htLookInCacheForMetaTags(url); */
}
}
PR_PUBLIC_API(void)
HT_LayoutComplete(TagList *metaTags, char *url)
HT_LayoutComplete(MWContext *context, TagList *metaTags, char *url)
{
XP_ASSERT(metaTags != NULL);
XP_ASSERT(url != NULL);
INTL_CharSetInfo csid;
PA_Block name, content;
PA_Tag *metaList;
RDF_Resource r;
char *temp;
unsigned long matchNum;
if ((metaTags != NULL) && (url != NULL))
struct {
char *name;
RDF_Resource r;
} matches[9];
/* Note: if more elements are added, adjust the size of the array above! */
matches[0].name = "description"; matches[0].r = gWebData->RDF_description;
matches[1].name = "keyword"; matches[1].r = gWebData->RDF_keyword;
matches[2].name = "smallIcon"; matches[2].r = gNavCenter->RDF_smallIcon;
matches[3].name = "largeIcon"; matches[3].r = gNavCenter->RDF_largeIcon;
matches[4].name = "smallPressedIcon"; matches[4].r = gNavCenter->RDF_smallPressedIcon;
matches[5].name = "largePressedIcon"; matches[5].r = gNavCenter->RDF_largePressedIcon;
matches[6].name = "smallRolloverIcon"; matches[6].r = gNavCenter->RDF_smallRolloverIcon;
matches[7].name = "largeRolloverIcon"; matches[7].r = gNavCenter->RDF_largeRolloverIcon;
matches[8].name = NULL; matches[8].r = NULL;
XP_ASSERT(context != NULL);
if (context == NULL) return;
XP_ASSERT(metaTags != NULL);
if (metaTags == NULL) return;
XP_ASSERT(url != NULL);
if (url == NULL) return;
csid = LO_GetDocumentCharacterSetInfo(context);
metaList = metaTags->tagList;
while (metaList != NULL)
{
/* if url exists in RDF graph, then get any META tags
for this document from the context, and save them */
if (metaList->data != NULL)
{
/* get any META tags for this document
and save them into the graph */
name = PA_FetchParamValue(metaList, "name", (uint16)csid);
content = PA_FetchParamValue(metaList, "content", (uint16)csid);
if ((name != NULL) && (content != NULL))
{
if ((r = RDF_GetResource(gNCDB, url, PR_TRUE)) != NULL)
{
for (matchNum=0; matches[matchNum].name != NULL; matchNum++)
{
if (!strcmp((char *)name, matches[matchNum].name))
{
/* if already exists, don't change */
if ((temp = RDF_GetSlotValue(gNCDB, r,
matches[matchNum].r, RDF_STRING_TYPE,
PR_FALSE, PR_TRUE)) != NULL)
{
freeMem(temp);
}
else
{
RDF_Assert(gNCDB, r, matches[matchNum].r,
(char *)content, RDF_STRING_TYPE);
}
}
}
}
}
}
metaList = metaList->next;
}
}
#if 0
void
htMetaTagURLExitFunc (URL_Struct *urls, int status, MWContext *cx)
{
@ -1552,9 +1615,11 @@ struct {
}
}
}
#endif
#if 0
void
htLookInCacheForMetaTags(char *url)
{
@ -1571,6 +1636,7 @@ htLookInCacheForMetaTags(char *url)
}
}
}
#endif
@ -1593,7 +1659,7 @@ HT_AddBookmark (char *url, char *optionalTitle)
}
htSetBookmarkAddDateToNow(r);
RDF_Assert(gNCDB, r, gCoreVocab->RDF_parent, nbFolder, RDF_RESOURCE_TYPE);
htLookInCacheForMetaTags(url);
/* htLookInCacheForMetaTags(url); */
}
}
}
@ -9642,7 +9708,7 @@ copyRDFLinkURL (HT_Resource dropTarget, char* objURL, char *objTitle)
}
}
RDF_Assert(db, obj, gCoreVocab->RDF_parent, new, RDF_RESOURCE_TYPE);
htLookInCacheForMetaTags(objURL);
/* htLookInCacheForMetaTags(objURL); */
return COPY_MOVE_LINK;
}
@ -9715,7 +9781,7 @@ copyRDFLinkURLAt (HT_Resource dropx, char* objURL, char *objTitle, PRBool before
RDF_Assert(db, obj, gCoreVocab->RDF_parent, parent, RDF_RESOURCE_TYPE);
XP_FREE(id);
}
htLookInCacheForMetaTags(objURL);
/* htLookInCacheForMetaTags(objURL); */
return (COPY_MOVE_LINK);
}

1
modules/rdf/src/ht.h
View File

@ -33,6 +33,7 @@
#include "nspr.h"
#include "prefapi.h"
#include "fe_proto.h"
#include "intl_csi.h"
#ifdef XP_MAC
#include "stdlib.h"