Revision: 28599
http://sourceforge.net/p/bibdesk/svn/28599
Author: hofman
Date: 2024-01-13 17:27:14 +0000 (Sat, 13 Jan 2024)
Log Message:
-----------
Enumerate keys and valuyes oif dictionaries. Shorten class name for soap
elements.
Modified Paths:
--------------
trunk/bibdesk/BDSKISIGroupServer.h
trunk/bibdesk/BDSKISIGroupServer.m
trunk/bibdesk/BDSKSoapBinding.h
trunk/bibdesk/BDSKSoapBinding.m
trunk/bibdesk/WOKMWSAuthenticateService.h
trunk/bibdesk/WokSearchLiteService.h
trunk/bibdesk/WokSearchService.h
Modified: trunk/bibdesk/BDSKISIGroupServer.h
===================================================================
--- trunk/bibdesk/BDSKISIGroupServer.h 2024-01-11 18:47:19 UTC (rev 28598)
+++ trunk/bibdesk/BDSKISIGroupServer.h 2024-01-13 17:27:14 UTC (rev 28599)
@@ -39,7 +39,7 @@
#import <Cocoa/Cocoa.h>
#import "BDSKSearchGroup.h"
-@class BDSKSoapBindingElement, BDSKSoapBindingOperation;
+@class BDSKSoapElement, BDSKSoapBindingOperation;
@interface BDSKISIGroupServer : NSObject <BDSKSearchGroupServer>
{
@@ -52,7 +52,7 @@
NSInteger state;
NSString *searchTerm;
NSString *errorMessage;
- BDSKSoapBindingElement *request;
+ BDSKSoapElement *request;
BDSKSoapBindingOperation *operation;
NSHTTPCookie *sessionCookie;
}
Modified: trunk/bibdesk/BDSKISIGroupServer.m
===================================================================
--- trunk/bibdesk/BDSKISIGroupServer.m 2024-01-11 18:47:19 UTC (rev 28598)
+++ trunk/bibdesk/BDSKISIGroupServer.m 2024-01-13 17:27:14 UTC (rev 28599)
@@ -97,7 +97,7 @@
- (void)searchWithAuthentication;
- (void)search;
- (void)closeSession;
-- (BDSKSoapBindingElement *)newRequestReturningError:(NSString **)errorString;
+- (BDSKSoapElement *)newRequestReturningError:(NSString **)errorString;
- (BibItem *)newItemFromInfo:(NSDictionary *)pubInfo;
@@ -396,7 +396,7 @@
}
-- (BDSKSoapBindingElement *)newRequestReturningError:(NSString **)errorString {
+- (BDSKSoapElement *)newRequestReturningError:(NSString **)errorString {
NSString *query = [self searchTerm];
static NSString *operator[5] = {@"", @"citedby:", @"citing:", @"related:",
@"uid:"};
Modified: trunk/bibdesk/BDSKSoapBinding.h
===================================================================
--- trunk/bibdesk/BDSKSoapBinding.h 2024-01-11 18:47:19 UTC (rev 28598)
+++ trunk/bibdesk/BDSKSoapBinding.h 2024-01-13 17:27:14 UTC (rev 28599)
@@ -1,6 +1,6 @@
#import <Cocoa/Cocoa.h>
-@class BDSKSoapBindingElement;
+@class BDSKSoapElement;
@class BDSKSoapBindingOperation;
@class BDSKDownload;
@@ -52,24 +52,24 @@
@property (nonatomic, weak) id<BDSKSoapBindingOperationDelegate> delegate;
@property (nonatomic, strong) BDSKDownload *download;
- (id)initWithBinding:(BDSKSoapBinding *)aBinding
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate soapAction:(NSString
*)aSoapAction bodyElements:(NSDictionary *)aBodyElements
responseClasses:(NSDictionary *)aResponseClasses;
-- (id)initWithParameters:(BDSKSoapBindingElement *)parameters
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate;
+- (id)initWithParameters:(BDSKSoapElement *)parameters
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate;
- (void)start;
- (void)waitUntilExit;
- (void)cancel;
@end
-@protocol BDSKSoapBindingElement <NSObject>
+@protocol BDSKSoapElement <NSObject>
- (NSXMLElement *)XMLNodeWithName:(NSString *)elName prefix:(NSString
*)elNSPrefix;
+ (instancetype)deserializeNode:(NSXMLElement *)node;
@end
-@interface BDSKSoapBindingElement : NSObject <BDSKSoapBindingElement> {
+@interface BDSKSoapElement : NSObject <BDSKSoapElement> {
}
- (void)addElementsToNode:(NSXMLElement *)node;
- (void)deserializeChildNode:(NSXMLElement *)node;
@end
-@interface BDSKSoapBinding_fault : BDSKSoapBindingElement {
+@interface BDSKSoapBinding_fault : BDSKSoapElement {
NSString *faultcode;
NSString *faultstring;
NSString *faultactor;
@@ -79,8 +79,8 @@
@property (nonatomic, strong) NSString *faultactor;
@end
-@interface NSString (BDSKSoapBindingElement) <BDSKSoapBindingElement>
+@interface NSString (BDSKSoapElement) <BDSKSoapElement>
@end
-@interface NSNumber (BDSKSoapBindingElement) <BDSKSoapBindingElement>
+@interface NSNumber (BDSKSoapElement) <BDSKSoapElement>
@end
Modified: trunk/bibdesk/BDSKSoapBinding.m
===================================================================
--- trunk/bibdesk/BDSKSoapBinding.m 2024-01-11 18:47:19 UTC (rev 28598)
+++ trunk/bibdesk/BDSKSoapBinding.m 2024-01-13 17:27:14 UTC (rev 28599)
@@ -77,10 +77,9 @@
NSXMLElement *headerNode = [NSXMLElement
elementWithName:@"soap:Header"];
[root addChild:headerNode];
- for(NSString *key in [headerElements allKeys]) {
- id<BDSKSoapBindingElement> header = [headerElements
objectForKey:key];
+ [headerElements enumerateKeysAndObjectsUsingBlock:^(NSString *key,
id<BDSKSoapElement> header, BOOL *stop){
[headerNode addChild:[header XMLNodeWithName:key
prefix:[ns name]]];
- }
+ }];
}
if((bodyElements != nil) && ([bodyElements count] > 0)) {
@@ -87,10 +86,9 @@
NSXMLElement *bodyNode = [NSXMLElement
elementWithName:@"soap:Body"];
[root addChild:bodyNode];
- for(NSString *key in [bodyElements allKeys]) {
- id<BDSKSoapBindingElement> body = [bodyElements
objectForKey:key];
+ [bodyElements enumerateKeysAndObjectsUsingBlock:^(NSString *key,
id<BDSKSoapElement> body, BOOL *stop){
[bodyNode addChild:[body XMLNodeWithName:key prefix:[ns
name]]];
- }
+ }];
}
NSString *serializedForm = [doc XMLString];
@@ -153,7 +151,7 @@
return self;
}
-- (id)initWithParameters:(BDSKSoapBindingElement *)parameters
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate
+- (id)initWithParameters:(BDSKSoapElement *)parameters
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate
{
// derive the element name, response name and class, and binding from the
class name
NSString *name = NSStringFromClass([parameters class]);
@@ -287,7 +285,7 @@
for(NSXMLElement *bodyNode in
[node children]) {
if([bodyNode kind] ==
NSXMLElementKind) {
-
Class<BDSKSoapBindingElement> responseClass = [self.responseClasses
objectForKey:[bodyNode localName]];
+
Class<BDSKSoapElement> responseClass = [self.responseClasses
objectForKey:[bodyNode localName]];
if(responseClass != nil) {
id
bodyObject = [responseClass deserializeNode:bodyNode];
//NSAssert1(bodyObject != nil, @"Errors while parsing body %s", [bodyNode
name]);
@@ -312,7 +310,7 @@
}
@end
-@implementation BDSKSoapBindingElement
+@implementation BDSKSoapElement
- (NSXMLElement *)XMLNodeWithName:(NSString *)elName prefix:(NSString
*)elNSPrefix
{
if(elNSPrefix != nil && [elNSPrefix length] > 0)
@@ -386,7 +384,7 @@
}
@end
-@implementation NSString (BDSKSoapBindingElement)
+@implementation NSString (BDSKSoapElement)
- (NSXMLElement *)XMLNodeWithName:(NSString *)elName prefix:(NSString
*)elNSPrefix
{
if(elNSPrefix != nil && [elNSPrefix length] > 0)
@@ -402,7 +400,7 @@
}
@end
-@implementation NSNumber (BDSKSoapBindingElement)
+@implementation NSNumber (BDSKSoapElement)
- (NSXMLElement *)XMLNodeWithName:(NSString *)elName prefix:(NSString
*)elNSPrefix
{
return [[self stringValue] XMLNodeWithName:elName prefix:elNSPrefix];
Modified: trunk/bibdesk/WOKMWSAuthenticateService.h
===================================================================
--- trunk/bibdesk/WOKMWSAuthenticateService.h 2024-01-11 18:47:19 UTC (rev
28598)
+++ trunk/bibdesk/WOKMWSAuthenticateService.h 2024-01-13 17:27:14 UTC (rev
28599)
@@ -1,19 +1,19 @@
#import <Cocoa/Cocoa.h>
#import "BDSKSoapBinding.h"
-@interface WOKMWSAuthenticateService_authenticate : BDSKSoapBindingElement
+@interface WOKMWSAuthenticateService_authenticate : BDSKSoapElement
@end
-@interface WOKMWSAuthenticateService_authenticateResponse :
BDSKSoapBindingElement {
+@interface WOKMWSAuthenticateService_authenticateResponse : BDSKSoapElement {
NSString * return_;
}
@property (nonatomic, strong) NSString * return_;
@end
-@interface WOKMWSAuthenticateService_closeSession : BDSKSoapBindingElement
+@interface WOKMWSAuthenticateService_closeSession : BDSKSoapElement
@end
-@interface WOKMWSAuthenticateService_closeSessionResponse :
BDSKSoapBindingElement
+@interface WOKMWSAuthenticateService_closeSessionResponse : BDSKSoapElement
@end
@interface WOKMWSAuthenticateService : BDSKSoapBinding
Modified: trunk/bibdesk/WokSearchLiteService.h
===================================================================
--- trunk/bibdesk/WokSearchLiteService.h 2024-01-11 18:47:19 UTC (rev
28598)
+++ trunk/bibdesk/WokSearchLiteService.h 2024-01-13 17:27:14 UTC (rev
28599)
@@ -1,7 +1,7 @@
#import <Cocoa/Cocoa.h>
#import "BDSKSoapBinding.h"
-@interface WokSearchLiteService_sortField : BDSKSoapBindingElement {
+@interface WokSearchLiteService_sortField : BDSKSoapElement {
NSString * name;
NSString * sort;
}
@@ -9,7 +9,7 @@
@property (nonatomic, strong) NSString * sort;
@end
-@interface WokSearchLiteService_retrieveParameters : BDSKSoapBindingElement {
+@interface WokSearchLiteService_retrieveParameters : BDSKSoapElement {
NSNumber * firstRecord;
NSNumber * count;
NSMutableArray *sortField;
@@ -20,7 +20,7 @@
@property (nonatomic, readonly) NSArray * sortField;
@end
-@interface WokSearchLiteServiceRequest : BDSKSoapBindingElement {
+@interface WokSearchLiteServiceRequest : BDSKSoapElement {
WokSearchLiteService_retrieveParameters * retrieveParameters;
}
@property (nonatomic, strong) WokSearchLiteService_retrieveParameters *
retrieveParameters;
@@ -32,7 +32,7 @@
@property (nonatomic, strong) NSString * queryId;
@end
-@interface WokSearchLiteService_labelValuesPair : BDSKSoapBindingElement {
+@interface WokSearchLiteService_labelValuesPair : BDSKSoapElement {
NSString * label;
NSMutableArray *value;
}
@@ -41,7 +41,7 @@
@property (nonatomic, readonly) NSArray * value;
@end
-@interface WokSearchLiteService_liteRecord : BDSKSoapBindingElement {
+@interface WokSearchLiteService_liteRecord : BDSKSoapElement {
NSString * uid;
NSMutableArray *title;
NSMutableArray *source;
@@ -62,7 +62,7 @@
@property (nonatomic, readonly) NSArray * other;
@end
-@interface WokSearchLiteService_searchResults : BDSKSoapBindingElement {
+@interface WokSearchLiteService_searchResults : BDSKSoapElement {
NSString * queryId;
NSNumber * recordsFound;
NSNumber * recordsSearched;
@@ -77,7 +77,7 @@
@property (nonatomic, readonly) NSArray * records;
@end
-@interface WokSearchLiteService_retrieveResponse : BDSKSoapBindingElement {
+@interface WokSearchLiteService_retrieveResponse : BDSKSoapElement {
WokSearchLiteService_searchResults * return_;
}
@property (nonatomic, strong) WokSearchLiteService_searchResults * return_;
@@ -94,13 +94,13 @@
@property (nonatomic, strong) NSString * queryLanguage;
@end
-@interface WokSearchLiteService_retrieveByIdResponse : BDSKSoapBindingElement {
+@interface WokSearchLiteService_retrieveByIdResponse : BDSKSoapElement {
WokSearchLiteService_searchResults * return_;
}
@property (nonatomic, strong) WokSearchLiteService_searchResults * return_;
@end
-@interface WokSearchLiteService_editionDesc : BDSKSoapBindingElement {
+@interface WokSearchLiteService_editionDesc : BDSKSoapElement {
NSString * collection;
NSString * edition;
}
@@ -108,7 +108,7 @@
@property (nonatomic, strong) NSString * edition;
@end
-@interface WokSearchLiteService_timeSpan : BDSKSoapBindingElement {
+@interface WokSearchLiteService_timeSpan : BDSKSoapElement {
NSString * begin;
NSString * end;
}
@@ -116,7 +116,7 @@
@property (nonatomic, strong) NSString * end;
@end
-@interface WokSearchLiteService_queryParameters : BDSKSoapBindingElement {
+@interface WokSearchLiteService_queryParameters : BDSKSoapElement {
NSString * databaseId;
NSString * userQuery;
NSMutableArray *editions;
@@ -139,7 +139,7 @@
@property (nonatomic, strong) WokSearchLiteService_queryParameters *
queryParameters;
@end
-@interface WokSearchLiteService_searchResponse : BDSKSoapBindingElement {
+@interface WokSearchLiteService_searchResponse : BDSKSoapElement {
WokSearchLiteService_searchResults * return_;
}
@property (nonatomic, strong) WokSearchLiteService_searchResults * return_;
Modified: trunk/bibdesk/WokSearchService.h
===================================================================
--- trunk/bibdesk/WokSearchService.h 2024-01-11 18:47:19 UTC (rev 28598)
+++ trunk/bibdesk/WokSearchService.h 2024-01-13 17:27:14 UTC (rev 28599)
@@ -2,7 +2,7 @@
#import "BDSKSoapBinding.h"
-@interface WokSearchService_sortField : BDSKSoapBindingElement {
+@interface WokSearchService_sortField : BDSKSoapElement {
NSString * name;
NSString * sort;
}
@@ -10,7 +10,7 @@
@property (nonatomic, strong) NSString * sort;
@end
-@interface WokSearchService_viewField : BDSKSoapBindingElement {
+@interface WokSearchService_viewField : BDSKSoapElement {
NSString * collectionName;
NSMutableArray *fieldName;
}
@@ -19,7 +19,7 @@
@property (nonatomic, readonly) NSArray * fieldName;
@end
-@interface WokSearchService_keyValuePair : BDSKSoapBindingElement {
+@interface WokSearchService_keyValuePair : BDSKSoapElement {
NSString * key;
NSString * value;
}
@@ -27,7 +27,7 @@
@property (nonatomic, strong) NSString * value;
@end
-@interface WokSearchService_retrieveParameters : BDSKSoapBindingElement {
+@interface WokSearchService_retrieveParameters : BDSKSoapElement {
NSNumber * firstRecord;
NSNumber * count;
NSMutableArray *sortField;
@@ -44,7 +44,7 @@
@property (nonatomic, readonly) NSArray * option;
@end
-@interface WokSearchServiceRequest : BDSKSoapBindingElement {
+@interface WokSearchServiceRequest : BDSKSoapElement {
WokSearchService_retrieveParameters * retrieveParameters;
}
@property (nonatomic, strong) WokSearchService_retrieveParameters *
retrieveParameters;
@@ -60,7 +60,7 @@
@property (nonatomic, strong) NSString * queryLanguage;
@end
-@interface WokSearchService_citedReference : BDSKSoapBindingElement {
+@interface WokSearchService_citedReference : BDSKSoapElement {
NSString * uid;
NSString * docid;
NSString * articleId;
@@ -86,7 +86,7 @@
@property (nonatomic, strong) NSString * hot;
@end
-@interface WokSearchService_citedReferencesSearchResults :
BDSKSoapBindingElement {
+@interface WokSearchService_citedReferencesSearchResults : BDSKSoapElement {
NSString * queryId;
NSMutableArray *references;
NSNumber * recordsFound;
@@ -99,7 +99,7 @@
@property (nonatomic, strong) NSNumber * recordsSearched;
@end
-@interface WokSearchService_citedReferencesResponse : BDSKSoapBindingElement {
+@interface WokSearchService_citedReferencesResponse : BDSKSoapElement {
WokSearchService_citedReferencesSearchResults * return_;
}
@property (nonatomic, strong) WokSearchService_citedReferencesSearchResults *
return_;
@@ -111,7 +111,7 @@
@property (nonatomic, strong) NSString * queryId;
@end
-@interface WokSearchService_citedReferencesRetrieveResponse :
BDSKSoapBindingElement {
+@interface WokSearchService_citedReferencesRetrieveResponse : BDSKSoapElement {
NSMutableArray *return_;
}
- (void)addReturn_:(WokSearchService_citedReference *)toAdd;
@@ -118,7 +118,7 @@
@property (nonatomic, readonly) NSArray * return_;
@end
-@interface WokSearchService_editionDesc : BDSKSoapBindingElement {
+@interface WokSearchService_editionDesc : BDSKSoapElement {
NSString * collection;
NSString * edition;
}
@@ -126,7 +126,7 @@
@property (nonatomic, strong) NSString * edition;
@end
-@interface WokSearchService_timeSpan : BDSKSoapBindingElement {
+@interface WokSearchService_timeSpan : BDSKSoapElement {
NSString * begin;
NSString * end;
}
@@ -149,7 +149,7 @@
@property (nonatomic, strong) NSString * queryLanguage;
@end
-@interface WokSearchService_labelValuesPair : BDSKSoapBindingElement {
+@interface WokSearchService_labelValuesPair : BDSKSoapElement {
NSString * label;
NSMutableArray *value;
}
@@ -158,7 +158,7 @@
@property (nonatomic, readonly) NSArray * value;
@end
-@interface WokSearchService_fullRecordSearchResults : BDSKSoapBindingElement {
+@interface WokSearchService_fullRecordSearchResults : BDSKSoapElement {
NSString * queryId;
NSNumber * recordsFound;
NSNumber * recordsSearched;
@@ -175,7 +175,7 @@
@property (nonatomic, strong) NSString * records;
@end
-@interface WokSearchService_citingArticlesResponse : BDSKSoapBindingElement {
+@interface WokSearchService_citingArticlesResponse : BDSKSoapElement {
WokSearchService_fullRecordSearchResults * return_;
}
@property (nonatomic, strong) WokSearchService_fullRecordSearchResults *
return_;
@@ -196,7 +196,7 @@
@property (nonatomic, strong) NSString * queryLanguage;
@end
-@interface WokSearchService_relatedRecordsResponse : BDSKSoapBindingElement {
+@interface WokSearchService_relatedRecordsResponse : BDSKSoapElement {
WokSearchService_fullRecordSearchResults * return_;
}
@property (nonatomic, strong) WokSearchService_fullRecordSearchResults *
return_;
@@ -208,7 +208,7 @@
@property (nonatomic, strong) NSString * queryId;
@end
-@interface WokSearchService_fullRecordData : BDSKSoapBindingElement {
+@interface WokSearchService_fullRecordData : BDSKSoapElement {
NSMutableArray *optionValue;
NSString * records;
}
@@ -217,7 +217,7 @@
@property (nonatomic, strong) NSString * records;
@end
-@interface WokSearchService_retrieveResponse : BDSKSoapBindingElement {
+@interface WokSearchService_retrieveResponse : BDSKSoapElement {
WokSearchService_fullRecordData * return_;
}
@property (nonatomic, strong) WokSearchService_fullRecordData * return_;
@@ -234,13 +234,13 @@
@property (nonatomic, strong) NSString * queryLanguage;
@end
-@interface WokSearchService_retrieveByIdResponse : BDSKSoapBindingElement {
+@interface WokSearchService_retrieveByIdResponse : BDSKSoapElement {
WokSearchService_fullRecordSearchResults * return_;
}
@property (nonatomic, strong) WokSearchService_fullRecordSearchResults *
return_;
@end
-@interface WokSearchService_queryParameters : BDSKSoapBindingElement {
+@interface WokSearchService_queryParameters : BDSKSoapElement {
NSString * databaseId;
NSString * userQuery;
NSMutableArray *editions;
@@ -263,7 +263,7 @@
@property (nonatomic, strong) WokSearchService_queryParameters *
queryParameters;
@end
-@interface WokSearchService_searchResponse : BDSKSoapBindingElement {
+@interface WokSearchService_searchResponse : BDSKSoapElement {
WokSearchService_fullRecordSearchResults * return_;
}
@property (nonatomic, strong) WokSearchService_fullRecordSearchResults *
return_;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
