gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-16 00:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2001-03-14 Manuel Guesdon <mguesdon@orange-concept.com>

Browse source 
* GSWeb.framework/GSWComponent.m: Traces
        * GSWeb.framework/GSWConstants.m/.h: new GSWAssociation special keys: GSLanguage
        * GSWeb.framework/GSWAssociations.m: Handle special keys: GSLanguage, handle EONull
        * GSWeb.framework/GSWBundle.m: traces, fix cached not found path in
                lockedResourceNamed:ofType:withLanguages:usingCache:relativePath:absolutePath:
        * GSWeb.framework/GSWResourceManager.m: traces, fix bugs poblems in ISO/GS Languages (trim spaces and lowercase
        * GSWeb.framework/GSWeb.h: removed #include <Foundation/NSGArray.h> (thanks Sungjin Chun <ninja@linuxone.co.kr>)
        * GSWExtensions.framework: re-added GSWSessionRestorationErrorPage.gswd
        * INSTALL: minor changes (directory name,...)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@9372 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Manuel Guesdon 2001-03-14 22:12:57 +00:00
parent ad86512cb7
commit 2f98838e33
9 changed files with 70 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2001-03-14 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWComponent.m: Traces
* GSWeb.framework/GSWConstants.m/.h: new GSWAssociation special keys: GSLanguage
* GSWeb.framework/GSWAssociations.m: Handle special keys: GSLanguage, handle EONull
* GSWeb.framework/GSWBundle.m: traces, fix cached not found path in
lockedResourceNamed:ofType:withLanguages:usingCache:relativePath:absolutePath:
* GSWeb.framework/GSWResourceManager.m: traces, fix bugs poblems in ISO/GS Languages (trim spaces and lowercase
* GSWeb.framework/GSWeb.h: removed #include <Foundation/NSGArray.h> (thanks Sungjin Chun <ninja@linuxone.co.kr>)
* GSWExtensions.framework: re-added GSWSessionRestorationErrorPage.gswd
* INSTALL: minor changes (directory name,...)
2001-03-12 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWTemplateParserXML.m: fix for autoclose tags

17
GSWExtensions.framework/GSWSessionRestorationErrorPage.gswd Normal file
View file

@ -0,0 +1,17 @@
ExclamationImage: GSWImage
{
filename = "exclamation.gif";
framework = "GSWExtensions";
border = 0;
}
ApplicationNameString: GSWString
{
value = application.name;
}
ReenterHyperlink: GSWHyperlink
{
pageName = "Main";
target = "_top";
}

18
GSWeb.framework/GSWAssociation.m
View file

@ -596,9 +596,10 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
forKeyPath:(NSString*)keyPath_
{
id retValue=nil;
id EONullNull=[EONull null];
LOGClassFnStart();
NSDebugMLLog(@"associations",@"GSWAssociation: keyPath_=%@ object_=%p",keyPath_,(void*)object_);
if (keyPath_ && object_)
if (keyPath_ && object_ && object_!=EONullNull)
{
NSMutableArray* keys=[[keyPath_ componentsSeparatedByString:@"."] mutableCopy];
id _part=nil;
@ -635,6 +636,19 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
else
retValue=nil;
}
else if ([_part isEqualToString:GSASK_Language])
{
NSArray* languages=[[GSWApp _context] languages];
int count=[languages count];
id v=nil;
int i=0;
for(i=0;!v && i<count;i++)
{
id language=[languages objectAtIndex:i];
v=[retValue getIVarNamed:language];
};
retValue=v;
}
else
{
NS_DURING
@ -645,6 +659,8 @@ static NSMutableArray* associationsLogsHandlerClasses=nil;
[localException raise];
NS_ENDHANDLER
};
if (retValue==EONullNull)
retValue=nil;
};
};
NSDebugMLLog(@"associations",@"retValue=%@",retValue);

8
GSWeb.framework/GSWBundle.m
View file

@ -283,7 +283,11 @@ objectForReference:(NSString*)keyPath
if ([[GSWApplication application] isCachingEnabled])
_resource=[cache_ objectForKey:_relativePath];
if (_resource==GSNotFoundMarker)
{
_resource=nil;
_absolutePath=nil;
_relativePath=nil;
}
else if (!_resource)
{
_exists=[_fileManager fileExistsAtPath:_absolutePath];
@ -964,20 +968,24 @@ objectForReference:(NSString*)keyPath
NSString* _absolutePath=nil;
BOOL _isCachingEnabled=NO;
LOGObjectFnStart();
NSDebugMLLog(@"bundles",@"search=%@.%@",name_,GSWArchiveSuffix[GSWebNamingConv]);
_archive=[self lockedResourceNamed:name_
ofType:GSWArchiveSuffix[GSWebNamingConv]
withLanguages:nil
usingCache:archiveCache
relativePath:&_relativePath
absolutePath:&_absolutePath];
NSDebugMLLog(@"bundles",@"_archive=%p _absolutePath=%@",_archive,_absolutePath);
if (!_archive && !_absolutePath)
{
NSDebugMLLog(@"bundles",@"search=%@.%@",name_,GSWArchiveSuffix[GSWebNamingConvInversed]);
_archive=[self lockedResourceNamed:name_
ofType:GSWArchiveSuffix[GSWebNamingConvInversed]
withLanguages:nil
usingCache:archiveCache
relativePath:&_relativePath
absolutePath:&_absolutePath];
NSDebugMLLog(@"bundles",@"_archive=%p _absolutePath=%@",_archive,_absolutePath);
};
if (!_archive)
{

5
GSWeb.framework/GSWComponent.m
View file

@ -850,7 +850,7 @@ associationsKeys:(NSArray*)_associationsKeys
GSWAssociation* _assoc=nil;
LOGObjectFnStart();
NSDebugMLLog(@"gswcomponents",@"parentBindingName_=%@",parentBindingName_);
NSDebugMLLog(@"gswcomponents",@"parent=%p",(void*)parent);
NSDebugMLLog(@"gswcomponents",@"parent=%p of class %@",(void*)parent,[parent class]);
if (parent)
{
_assoc=[self _associationWithName:parentBindingName_];
@ -879,10 +879,13 @@ associationsKeys:(NSArray*)_associationsKeys
NSDictionary* _userDictionary=[self userDictionary];
id _synchronizesVariablesWithBindingsValue=[_userDictionary objectForKey:@"synchronizesVariablesWithBindings"];
BOOL _synchronizesVariablesWithBindings=YES;
NSDebugMLLog(@"gswcomponents",@"userDictionary _synchronizesVariablesWithBindingsValue=%@",_synchronizesVariablesWithBindingsValue);
//NDFN
if (_synchronizesVariablesWithBindingsValue)
{
_synchronizesVariablesWithBindings=[_synchronizesVariablesWithBindingsValue boolValue];
NSDebugMLLog(@"gswcomponents",@"userDictionary _synchronizesVariablesWithBindings=%s",
(_synchronizesVariablesWithBindings ? "YES" : "NO"));
};
return _synchronizesVariablesWithBindings ;
};

1
GSWeb.framework/GSWConstants.h
View file

@ -193,6 +193,7 @@ extern NSString* GSASK_Field;
extern NSString* GSASK_FieldValidate;
extern NSString* GSASK_FieldTitle;
extern NSString* GSASK_Class;
extern NSString* GSASK_Language;
//====================================================================
// Page names

1
GSWeb.framework/GSWConstants.m
View file

@ -190,6 +190,7 @@ NSString* GSASK_Field=@"GSField";
NSString* GSASK_FieldValidate=@"GSFieldValidate";
NSString* GSASK_FieldTitle=@"GSFieldTitle";
NSString* GSASK_Class = @"GSClass";
NSString* GSASK_Language = @"GSLanguage";
//====================================================================
// Page names

14
GSWeb.framework/GSWResourceManager.m
View file

@ -1405,7 +1405,7 @@ NSString* globalLanguagesPListPathName=nil;
//NDFN
+(NSString*)GSLanguageFromISOLanguage:(NSString*)ISOLanguage_
{
return [localISO2GSLanguages objectForKey:ISOLanguage_];
return [localISO2GSLanguages objectForKey:[[ISOLanguage_ stringByTrimmingSpaces] lowercaseString]];
};
//--------------------------------------------------------------------
@ -1421,7 +1421,7 @@ NSString* globalLanguagesPListPathName=nil;
int i=0;
for(i=0;i<[ISOLanguages_ count];i++)
{
_ISOLanguage=[[[ISOLanguages_ objectAtIndex:i] stringByTrimmingSpaces] lowercaseString];
_ISOLanguage=[ISOLanguages_ objectAtIndex:i];
_GSLanguage=[self GSLanguageFromISOLanguage:_ISOLanguage];
if (_GSLanguage)
[_array addObject:_GSLanguage];
@ -1439,7 +1439,7 @@ NSString* globalLanguagesPListPathName=nil;
//NDFN
+(NSString*)ISOLanguageFromGSLanguage:(NSString*)GSLanguage_
{
return [localGS2ISOLanguages objectForKey:GSLanguage_];
return [localGS2ISOLanguages objectForKey:[[GSLanguage_ stringByTrimmingSpaces] lowercaseString]];
};
//--------------------------------------------------------------------
@ -1455,7 +1455,7 @@ NSString* globalLanguagesPListPathName=nil;
int i=0;
for(i=0;i<[GSLanguages_ count];i++)
{
_GSLanguage=[[[GSLanguages_ objectAtIndex:i] stringByTrimmingSpaces] lowercaseString];
_GSLanguage=[GSLanguages_ objectAtIndex:i];
_ISOLanguage=[self ISOLanguageFromGSLanguage:_GSLanguage];
[_array addObject:_ISOLanguage];
};
@ -1545,7 +1545,7 @@ NSString* globalLanguagesPListPathName=nil;
NSMutableDictionary* _GS2ISO=[NSMutableDictionary dictionary];
LOGObjectFnStart();
_tmpLanguages=[NSDictionary dictionaryWithContentsOfFile:globalLanguagesPListPathName];
// NSDebugMLLog(@"resmanager",@"_tmpLanguages=%@",_tmpLanguages);
NSDebugMLLog(@"resmanager",@"_tmpLanguages=%@",_tmpLanguages);
if (_tmpLanguages)
{
NSEnumerator* enumerator = [_tmpLanguages keyEnumerator];
@ -1562,8 +1562,8 @@ NSString* globalLanguagesPListPathName=nil;
forKey:[_gs lowercaseString]];
};
};
// NSDebugMLLog(@"resmanager",@"_ISO2GS=%@",_ISO2GS);
// NSDebugMLLog(@"resmanager",@"_GS2ISO=%@",_ISO2GS);
NSDebugMLLog(@"resmanager",@"_ISO2GS=%@",_ISO2GS);
NSDebugMLLog(@"resmanager",@"_GS2ISO=%@",_GS2ISO);
};
ASSIGN(localISO2GSLanguages,[NSDictionary dictionaryWithDictionary:_ISO2GS]);
ASSIGN(localGS2ISOLanguages,[NSDictionary dictionaryWithDictionary:_GS2ISO]);

6
INSTALL
View file

@ -2,7 +2,7 @@ Installation
************
This file documents the installation of GNUstepWeb, `gsweb'. Copyright
(C) 1999-2000 Free Software Foundation, Inc. You may copy, distribute, and
(C) 1999-2001 Free Software Foundation, Inc. You may copy, distribute, and
modify it freely as long as you preserve this copyright notice and
permission notice.
@ -52,10 +52,10 @@ Installing `gsweb'
6) gsgd
8) GNUstepWeb
Go in the GNUstepWeb folder. make and make install.
Go in the gsweb folder. make and make install.
9) Apaches modules for GNUstepWeb
Still in the GNUstepWeb folder there is a GSWAdaptors/Apache folder, go in and make. There no make install. Instead you must copy the mod_gsweb.so module in you Apache libexec directory (something like /usr/apache/libexec).
Still in the gsweb folder there is a GSWAdaptors/Apache folder, go in and make. There no make install. Instead you must copy the mod_gsweb.so module in you Apache libexec directory (something like /usr/apache/libexec).
At this point everything is done, still remains the Apache configuration: