Changeset 4953

Timestamp:

14/05/08 18:53:47 (2 months ago)

Author:

MartinBudden

Message:

Improvements to wikispaces importing

Files:

• Trunk/contributors/MartinBudden/adaptors/ImportWorkspacePlugin.js (modified) (3 diffs)
• Trunk/contributors/MartinBudden/adaptors/WikispacesSoapAdaptorPlugin.js (modified) (8 diffs)
• Trunk/contributors/MartinBudden/plugins/ImportWikispacesMessagesPlugin.js (modified) (4 diffs)

Trunk/contributors/MartinBudden/adaptors/ImportWorkspacePlugin.js

@@ -4 +4 @@
-|''Author:''|Martin Budden (mjbudden (at) gmail (dot) com)|
-|''CodeRepository:''|http://svn.tiddlywiki.org/Trunk/contributors/MartinBudden/adaptors/ImportWorkspacePlugin.js |
-8
+9
-|''Date:''|Aug 23, 2007|
-|''Comments:''|Please make comments at http://groups.google.co.uk/group/TiddlyWikiDev |
@@ -142 +142 @@
-        if(context) {
-                context.adaptor.openHost(context.host,context);
-
-//context.adaptor.openWorkspace(context.workspace,context
+//
+context.adaptor.openWorkspace(context.workspace,context,null,config.macros.importWorkspace.openWorkspaceCallback
-                //context.adaptor.getTiddlerList(context);
-                return true;
@@ -150 +150 @@
-};
-
-getWorkspaceList
+openWorkspace
-{
-        if(context.status) {

Trunk/contributors/MartinBudden/adaptors/WikispacesSoapAdaptorPlugin.js

@@ -8 +8 @@
-|''Date:''|Feb 15, 2008|
-|''Comments:''|Please make comments at http://groups.google.co.uk/group/TiddlyWikiDev |
-2.5 License|http://creativecommons.org/licenses/by-sa/2.5
+3.0 License|http://creativecommons.org/licenses/by-sa/3.0
-|''~CoreVersion:''|2.3.0|
-
@@ -128 +128 @@
-WikispacesSoapAdaptor.loginCallback = function(r,x,context)//status,context,responseText,url,xhr)
-{
-var 
+context.
-fnLog('loginCallback:'+status);
-console.log(r);
-console.log(x);
-
-
-
-
-
+
-                context.sessionToken = r;
-                context.adaptor.sessionToken = r;
-
-
-
+
+
+
+
+
+
+
-};
-
@@ -161 +161 @@
-        this.workspace = workspace;
-        context = this.setContext(context,userParams,callback);
-        if(context.callback) {
-                context.status = true;
-                window.setTimeout(function() {callback(context,userParams);},0);
-        }
-        return true;
-};
-
-WikispacesSoapAdaptor.prototype.getWorkspaceList = function(context,userParams,callback)
-{
-fnLog('getWorkspaceList');
-        context = this.setContext(context,userParams,callback);
-        var workspace = userParams ? userParams.getValue("feedWorkspace") : context.workspace;//!! kludge until core fixed
-        var list = [];
-        list.push({title:workspace,name:workspace});
-        context.workspace = workspace;
-
-
-
-
-
-
-
+
+
+
+
+
+
-//# http://www.wikispaces.com/space/api?wsdl
-        var uri = WikispacesSoapAdaptor.SoapUri(context,'%0space/api');
@@ -188 +173 @@
-        var pl = new SOAPClientParameters();
-        pl.add('session',context.sessionToken);
-s[0].name
-getWorkspaceList
-
-
-
-getWorkspaceList
+
+openWorkspace
+
+
+
+openWorkspace
-{
-        var status = r instanceof Error ? false : true;
-getWorkspaceList
+openWorkspace
-        context.status = false;
-        function gev(p,i,n) {
@@ -203 +188 @@
-                } catch(ex) {
-                }
+                return null;
-        }
-        if(status) {
@@ -218 +204 @@
-                context.status = true;
-        } else {
+                context.statusText = WikispacesSoapAdaptor.errorInFunctionMessage.format(['openWorkspaceCallback']);
+        }
+        if(context.callback)
+                context.callback(context,context.userParams);
+};
+
+WikispacesSoapAdaptor.prototype.getWorkspaceList = function(context,userParams,callback)
+{
+fnLog('getWorkspaceList');
+        context = this.setContext(context,userParams,callback);
+        var workspace = userParams ? userParams.getValue("feedWorkspace") : context.workspace;//!! kludge until core fixed
+        var list = [];
+        list.push({title:workspace,name:workspace});
+        context.workspace = workspace;
+        context.workspaces = list;
+        return this.complete(context,WikispacesSoapAdaptor.getWorkspaceListComplete);
+};
+
+WikispacesSoapAdaptor.getWorkspaceListComplete = function(context,userParams)
+{
+fnLog('getWorkspaceListComplete');
+//# http://www.wikispaces.com/space/api?wsdl
+        var uri = WikispacesSoapAdaptor.SoapUri(context,'%0space/api');
+//#console.log('uri:'+uri);
+        var pl = new SOAPClientParameters();
+        pl.add('session',context.sessionToken);
+        pl.add('name',context.workspaces[0].name);
+        SOAPClient.invoke(uri,'getSpace',pl,true,WikispacesSoapAdaptor.getWorkspaceListCallback,context);
+        return true;
+};
+
+WikispacesSoapAdaptor.getWorkspaceListCallback = function(r,x,context)//(status,context,responseText,uri,xhr)
+{
+        var status = r instanceof Error ? false : true;
+fnLog('getWorkspaceListCallback:'+status);
+        context.status = false;
+        function gev(p,i,n) {
+                try {
+                        return p[i].getElementsByTagName(n)[0].childNodes[0].nodeValue;
+                } catch(ex) {
+                }
+                return null;
+        }
+        if(status) {
+                try {
+                        var p = x.getElementsByTagName('space');
+                        context.workspaceId = gev(p,0,'id');
+                        context.adaptor.workspaceId = context.workspaceId;
+//#console.log("workspaceId:"+context.workspaceId);
+                } catch (ex) {
+                        context.statusText = exceptionText(ex,WikispacesSoapAdaptor.serverParsingErrorMessage);
+                        if(context.callback)
+                                context.callback(context,context.userParams);
+                        return;
+                }
+                context.status = true;
+        } else {
-                context.statusText = WikispacesSoapAdaptor.errorInFunctionMessage.format(['getWorkspaceListCallback']);
-                //context.statusText = xhr.statusText;
-        }
-        if(context.callback)
@@ -387 +429 @@
-                } catch(ex) {
-                }
+                return null;
-        }
-        if(status) {
@@ -565 +608 @@
-{
-        var status = r instanceof Error ? false : true;
-//#
+
-        context.status = false;
-        context.statusText = WikispacesSoapAdaptor.errorInFunctionMessage.format(['getTopicListCallback']);

Trunk/contributors/MartinBudden/plugins/ImportWikispacesMessagesPlugin.js

@@ -4 +4 @@
-|''Author:''|Martin Budden (mjbudden (at) gmail (dot) com)|
-|''CodeRepository:''|http://svn.tiddlywiki.org/Trunk/contributors/MartinBudden/plugins/ImportWikispacesMessagesPlugin.js |
-2
+3
-|''Date:''|May 13, 2008|
-|''Comments:''|Please make comments at http://groups.google.co.uk/group/TiddlyWikiDev |
@@ -91 +91 @@
-{
-        if(context) {
+                context.title = title;
-                context.adaptor.openHost(context.host,context);
-
-
+
+
+
+
+
+
+
+
+
+
-                return true;
-        }
@@ -101 +110 @@
-config.macros.importWikispacesMessages.getTopicListCallback = function(context,userParams)
-{
-orkspace
+ikispacesMessages
-        if(context.status) {
-                var tiddlers = context.topics;
@@ -116 +125 @@
-config.macros.importWikispacesMessages.getMessageListCallback = function(context,userParams)
-{
-orkspace
+ikispacesMessages
-        if(context.status) {
-                var tiddlers = context.messages;