From 1c3dd2afa35eff77f84b9edfcc17a9ae8a748371 Mon Sep 17 00:00:00 2001 From: rjc Date: Tue, 14 Apr 1998 01:26:35 +0000 Subject: [PATCH] (Mac) Appletalk data source. --- modules/rdf/include/vocab.h | 1 + modules/rdf/macbuild/RDF.mcp | Bin 134163 -> 134163 bytes modules/rdf/src/fs2rdf.c | 40 +++++++++++++++++++++++------------ modules/rdf/src/ht.c | 16 ++++++++++++-- modules/rdf/src/ht.h | 3 ++- modules/rdf/src/rdf-int.h | 2 ++ modules/rdf/src/vocab.c | 2 ++ 7 files changed, 47 insertions(+), 17 deletions(-) diff --git a/modules/rdf/include/vocab.h b/modules/rdf/include/vocab.h index 94a3da2e328..11c1887a14e 100644 --- a/modules/rdf/include/vocab.h +++ b/modules/rdf/include/vocab.h @@ -71,6 +71,7 @@ typedef struct _RDF_NCVocabStruct { RDF_Resource RDF_Guide; RDF_Resource RDF_HTMLURL; RDF_Resource RDF_LocalFiles; + RDF_Resource RDF_Appletalk; RDF_Resource RDF_Mail; RDF_Resource RDF_Password; RDF_Resource RDF_SBProviders; diff --git a/modules/rdf/macbuild/RDF.mcp b/modules/rdf/macbuild/RDF.mcp index 3ca097fda5b9a8c72f13f2779c6ad935dc46b9ce..a971dc4bebb3aaf99522b519e1ab8ba0d0877732 100644 GIT binary patch delta 1819 zcmZ9MYfMx}6oBvCy}R6fc=53;vVh!*ZSj#^QV9txDcD7=ud*PK#Xz=#N)1nCZSBLF zVg!HGBAy>(TN7+;lg2a!oDfThp;f4DtfkgiYfFWwp~ga}8fq;~wr6(kTGL5p=gj%e zoY%}jm(W(4PMar$wICZnK$6W%Fa1naEN!ksn;%p^F$lW8LaI>F*4 zg|$y6MhQ;?7P;yao(rUUeHg;aZo9O(<}KkZb+z>F5~4@Tg|W(M$nu?J6))Lj@Dx|U z@mYhgz^lTDw*uytI9X|?U9l)L=rP!_VjBdq75FY|vDLY1&H9zRboN(PI(aJoESc{_ zoA_(^6UOxpu5aM_cLawd%~p7AkX(`sTeC|^GV9C!P-bblX9xtnRWRc7L@PR3?1Ry^ zM5g6ErYJK(-~+rJgOZeWj)qLK%dM_OT}FL#_)Ph@&t!ISUO2a4=*n_H1sns#m5E~RbA zLb*>IwWiQ~vz(Z;3AYY`v#z7uZ{RB0XqG*)wSjh;WtVJip{H^0cK(c2x`ch>Rl+Ovi>;&~%FkC#QUnq`W-HT{QV6B>lESU7iwB3SHZ9mWf z3wm?Ci8xo7H{3+|f-txJM5j1+OyJ(g{`e`BFADDIqG@r+H6Fq#&WCiAhXvPqXc6b$ zIk+Dbd@=t^xg>bbM!JvlT)Y+O6Tz3fhw^2?U7ypgIILzTR%3);-i_#rz%T5jqj6Zx z0F77CiYFDjJN(#UL%l)sIo41Sdq9ujggPx# delta 1731 zcmZ9MdrVwK6vpqJz58UlEU!!07TKav-b;j(2sJ!{&{k++O(dEcR37!Qly^)?6@`Qt zLjv0|POX1H)TG5!flde^)nFrrnyR$cilsn}Z7L>IG(>Ak&HByGMVn4CJKve#nYm}a zduQoU8$D_pyKLf1rg}A4rO{$@N>q)aD9s=nRrmBicx7o`L z6?AQ{ zdWmA<3;MQbHnXm7<>zl)!jW`7cvDyT(6W=zZatrlWj#+#_GG&3+fP4rZK3}-BIq55 zjr+5$TCn`(umNXtQ`H!LJNJIoB}$QvR9qMg7C&^aL)@MB7~z*&7gZWcKTh{|WWbjQ z9=EeVqr*ihqVwURw@lWmisPZs{15!OT^lORDAUD+q7+)>MCq>ZL?|@-4kn@q=m|xs zTSV};N_+bPytSfQ`>*<$f*d-!niwNW3)^B82~9Vux6>8>sbH1GsMXC^{PWSMv6t}I z4m|DPV_6TXVO!|;jUS=pLO$Dxa?`r1=)$2C-qrQGmG0@Oq)9zhbh_sWUQ~P@PS#U* zsYb8+Cv32vplf`+@1&Wo^;h<;_D`<%tKYS&yC&q~q$Ty3B8`NA4M!A6Ldg$n&`B5NCzC*Y*nZ z7m{a2F`osG!@VG-a{2tLKwnDi_?FdLQ1mn#u;8ioH`%lWyZI7<^JV(MYtZLpx^tDS z2_E+wVx#)uQ_$Z??yF%*R>5y0j+N_cz0h-#>w|2c;Ez0oct-M6@ken%^87^BEqFl= z;uDgm9fQ6oxqgg|T5*~soW^*3&KS@oiTD1>u3B-Li!9QHEOBQy-yN>^X47L?p}-Gd zV)FyK3;U*6vkjY^V?#Dr;+$b~B3o1-9r1SFfnJo`=|8fNz*`W?io8u((BhS%RcA7v z9XJ8n@MHBL^iSw$*_o`?j`KFmBanW0Kc9sDSx`l3e2)zXeqbDd^uz0RLSGkDQ3~*x z3jPB8Gz{^Ui_35$jFp!f*qWV`dHla1-n0V$V4F=p%l0|2zM>T~n_k?-s|Q%O111DU z*r*s?XV_JdUp<0+!;QxuhQ29x%+6zx5jd_Lq2b1%7U(sJ+a_3{z~YONZg{VGp#PA# r`W9=B!0zqwhz&PB5KgR1-hPD*3Em;{4L9CMhW=CX&Ue{d1S$O&??k2p diff --git a/modules/rdf/src/fs2rdf.c b/modules/rdf/src/fs2rdf.c index 7ca56ae269e..2c9b97a608c 100644 --- a/modules/rdf/src/fs2rdf.c +++ b/modules/rdf/src/fs2rdf.c @@ -95,18 +95,25 @@ buildVolumeList(RDF_Resource fs) char *volName; int volNum=0; - while (volNum < 26) { - if ((volName = getVolume(volNum++)) != NULL) { - - if ((vol = RDF_GetResource(NULL, volName, 1)) != NULL) - { - setContainerp(vol, 1); - setResourceType(vol, LFS_RT); - remoteStoreAdd(gRemoteStore, vol, gCoreVocab->RDF_parent, + while (volNum < 26) + { + if ((volName = getVolume(volNum++)) != NULL) + { + if ((vol = RDF_GetResource(NULL, volName, 1)) != NULL) + { + setContainerp(vol, 1); + setResourceType(vol, LFS_RT); + remoteStoreAdd(gRemoteStore, vol, gCoreVocab->RDF_parent, fs, RDF_RESOURCE_TYPE, 1); - } - } + } + } } + +#ifdef XP_MAC + remoteStoreAdd(gRemoteStore, gNavCenter->RDF_Appletalk, + gCoreVocab->RDF_parent, fs, RDF_RESOURCE_TYPE, 1); +#endif + } @@ -114,10 +121,15 @@ buildVolumeList(RDF_Resource fs) PRDir * OpenDir(char *name) { - if (startsWith("file:///", name)) { - /* return PR_OpenDir(&name[FS_URL_OFFSET]); */ - return CallPROpenDirUsingFileURL(name); - } else return(NULL); + if (startsWith("file:///", name)) + { + /* return PR_OpenDir(&name[FS_URL_OFFSET]); */ + return CallPROpenDirUsingFileURL(name); + } + else + { + return(NULL); + } } diff --git a/modules/rdf/src/ht.c b/modules/rdf/src/ht.c index 673cf93fd61..fdb06d189c6 100644 --- a/modules/rdf/src/ht.c +++ b/modules/rdf/src/ht.c @@ -916,6 +916,11 @@ gNavCenterDataSources1[15] = "rdf:localStore", "rdf:remoteStore", "rdf:history", /* "rdf:ldap", */ "rdf:esftp", "rdf:mail", + +#ifdef XP_MAC + "rdf:appletalk", +#endif + "rdf:lfs", "rdf:ht", "rdf:columns", NULL }; @@ -4107,7 +4112,7 @@ ht_isURLReal(HT_Resource node) */ if (HT_IsContainer(node)) { - if (type == RDF_RT || type == HISTORY_RT || type == SEARCH_RT || type == PM_RT || type == IM_RT) + if (type == RDF_RT || type == HISTORY_RT || type == SEARCH_RT || type == PM_RT || type == IM_RT || type == ATALKVIRTUAL_RT) { validFlag = false; } @@ -6779,7 +6784,11 @@ HT_AddSitemapFor(HT_Pane htPane, char *pUrl, char *pSitemapUrl, char* name) } -void RetainOldSitemaps (HT_Pane htPane, char *pUrl) { + + +void +RetainOldSitemaps (HT_Pane htPane, char *pUrl) +{ HT_URLSiteMapAssoc *nsmp; RDFT sp; @@ -6810,6 +6819,7 @@ void RetainOldSitemaps (HT_Pane htPane, char *pUrl) { } + PR_PUBLIC_API(void) HT_ExitPage(HT_Pane htPane, char *pUrl) { @@ -6834,6 +6844,8 @@ HT_ExitPage(HT_Pane htPane, char *pUrl) htPane->sbp = NULL; } + + void populateSBProviders (HT_Pane htPane) { diff --git a/modules/rdf/src/ht.h b/modules/rdf/src/ht.h index 43e058f3621..f36ab4a38ad 100644 --- a/modules/rdf/src/ht.h +++ b/modules/rdf/src/ht.h @@ -291,13 +291,14 @@ HT_DropAction uploadLFSURL (HT_Resource dropTarget, char* objURL); HT_DropAction uploadRDFFileURL (HT_Resource dropTarget, char* objURL); HT_DropAction esfsCopyMoveContentURL (HT_Resource dropTarget, char* objURL); HT_URLSiteMapAssoc * makeNewSMP (HT_Pane htPane, char* pUrl, char* sitemapurl); +void RetainOldSitemaps (HT_Pane htPane, char *pUrl); void populateSBProviders (HT_Pane htPane); SBProvider SBProviderOfNode (HT_Resource node); PRBool implicitDomainURL (char* url); PRBool domainMatches (char *dom, char *url); void nextDomain (char* dom, size_t *n); PRBool relatedLinksEnabledURL (char* url); -void ExitPageInt (HT_Pane htPane, char *pUrl, PRBool guessp) ; + XP_END_PROTOS #endif diff --git a/modules/rdf/src/rdf-int.h b/modules/rdf/src/rdf-int.h index 8af4996c6fa..c6ee912d1ac 100644 --- a/modules/rdf/src/rdf-int.h +++ b/modules/rdf/src/rdf-int.h @@ -77,6 +77,8 @@ #define RDM_RT 9 #define IM_RT 10 #define CACHE_RT 11 +#define ATALK_RT 12 +#define ATALKVIRTUAL_RT 13 #define WILDCARD_RT 15 diff --git a/modules/rdf/src/vocab.c b/modules/rdf/src/vocab.c index b710718815a..b4cbad70c91 100644 --- a/modules/rdf/src/vocab.c +++ b/modules/rdf/src/vocab.c @@ -124,6 +124,8 @@ createNavCenterVocab () { gNavCenter->RDF_largeIcon = RDF_GetResource(gCoreDB, "largeIcon", true); gNavCenter->RDF_HTMLURL = RDF_GetResource(gCoreDB, "htmlURL", true); gNavCenter->RDF_LocalFiles = RDF_GetResource(gCoreDB, "NC:LocalFiles", true); + gNavCenter->RDF_Appletalk = createContainer("NC:Appletalk"); + setResourceType(gNavCenter->RDF_Appletalk, ATALKVIRTUAL_RT); gNavCenter->RDF_Mail = RDF_GetResource(gCoreDB, "NC:Mail", true); gNavCenter->RDF_Guide = RDF_GetResource(gCoreDB, "NC:Guide", true); gNavCenter->RDF_Password = RDF_GetResource(gCoreDB, "password", true);