projects
/
mkjsf-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ab622b
)
Wiring of pazpar2 info command and response
author
Niels Erik G. Nielsen
<nielserik@indexdata.com>
Sat, 19 Apr 2014 00:39:35 +0000
(20:39 -0400)
committer
Niels Erik G. Nielsen
<nielserik@indexdata.com>
Sat, 19 Apr 2014 00:39:35 +0000
(20:39 -0400)
src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
patch
|
blob
|
history
src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java
patch
|
blob
|
history
src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
patch
|
blob
|
history
src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java
patch
|
blob
|
history
diff --git
a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
index
b847e17
..
a5a346d
100644
(file)
--- a/
src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
+++ b/
src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
@@
-45,6
+45,7
@@
public class Pazpar2Commands implements Serializable {
public static final String RECORD = "record";
\r
public static final String TERMLIST = "termlist";
\r
public static final String BYTARGET = "bytarget";
\r
public static final String RECORD = "record";
\r
public static final String TERMLIST = "termlist";
\r
public static final String BYTARGET = "bytarget";
\r
+ public static final String INFO = "info";
\r
private ServiceProxyCommands sp = null;
\r
\r
public Pazpar2Commands() {
\r
private ServiceProxyCommands sp = null;
\r
\r
public Pazpar2Commands() {
\r
@@
-127,12
+128,20
@@
public class Pazpar2Commands implements Serializable {
}
\r
\r
/**
\r
}
\r
\r
/**
\r
+ *
\r
+ * @return info command from current state
\r
+ */
\r
+ public InfoCommand getInfo () {
\r
+ return (InfoCommand) (Pz2Service.get().getStateMgr().getCommand(INFO));
\r
+ }
\r
+
\r
+ /**
\r
* Generically retrieves any command
\r
*
\r
* @param name name of command to retrieve
\r
* @return command of the given type
\r
*/
\r
* Generically retrieves any command
\r
*
\r
* @param name name of command to retrieve
\r
* @return command of the given type
\r
*/
\r
- public Pazpar2Command getCommand(String name) {
\r
+ public Pazpar2Command getCommand(String name) {
\r
return Pz2Service.get().getStateMgr().getCommand(name);
\r
}
\r
\r
return Pz2Service.get().getStateMgr().getCommand(name);
\r
}
\r
\r
diff --git
a/src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java
b/src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java
index
90e7f8d
..
7790c6f
100644
(file)
--- a/
src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java
+++ b/
src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java
@@
-147,6
+147,10
@@
public class Responses implements Serializable {
public ByTargetResponse getByTarget() {
\r
return ((ByTargetResponse) dataObjects.get("bytarget"));
\r
}
\r
public ByTargetResponse getByTarget() {
\r
return ((ByTargetResponse) dataObjects.get("bytarget"));
\r
}
\r
+
\r
+ public InfoResponse getInfo() {
\r
+ return ((InfoResponse) dataObjects.get("info"));
\r
+ }
\r
\r
public ResponseDataObject getResponseObject (String name) {
\r
return dataObjects.get(name);
\r
\r
public ResponseDataObject getResponseObject (String name) {
\r
return dataObjects.get(name);
\r
diff --git
a/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
b/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
index
50234e8
..
ffbfd8b
100644
(file)
--- a/
src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
+++ b/
src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
@@
-4,6
+4,7
@@
import java.util.HashMap;
import java.util.Map;
\r
\r
import com.indexdata.mkjsf.pazpar2.commands.BytargetCommand;
\r
import java.util.Map;
\r
\r
import com.indexdata.mkjsf.pazpar2.commands.BytargetCommand;
\r
+import com.indexdata.mkjsf.pazpar2.commands.InfoCommand;
\r
import com.indexdata.mkjsf.pazpar2.commands.InitCommand;
\r
import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;
\r
import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;
\r
import com.indexdata.mkjsf.pazpar2.commands.InitCommand;
\r
import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;
\r
import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;
\r
@@
-41,6
+42,7
@@
public class Pazpar2State {
commands.put(Pazpar2Commands.RECORD, new RecordCommand());
\r
commands.put(Pazpar2Commands.TERMLIST, new TermlistCommand());
\r
commands.put(Pazpar2Commands.BYTARGET, new BytargetCommand());
\r
commands.put(Pazpar2Commands.RECORD, new RecordCommand());
\r
commands.put(Pazpar2Commands.TERMLIST, new TermlistCommand());
\r
commands.put(Pazpar2Commands.BYTARGET, new BytargetCommand());
\r
+ commands.put(Pazpar2Commands.INFO, new InfoCommand());
\r
\r
commands.put(ServiceProxyCommands.AUTH, new AuthCommand());
\r
commands.put(ServiceProxyCommands.CATEGORIES, new CategoriesCommand());
\r
\r
commands.put(ServiceProxyCommands.AUTH, new AuthCommand());
\r
commands.put(ServiceProxyCommands.CATEGORIES, new CategoriesCommand());
\r
diff --git
a/src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java
b/src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java
index
7616f1e
..
94141c1
100644
(file)
--- a/
src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java
+++ b/
src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java
@@
-18,7
+18,8
@@
public class StateManager implements Serializable {
\r
Map<String, Pazpar2State> states = new HashMap<String, Pazpar2State>();
\r
String currentKey = "";
\r
\r
Map<String, Pazpar2State> states = new HashMap<String, Pazpar2State>();
\r
String currentKey = "";
\r
- private static List<String> allCommands = new ArrayList<String>(Arrays.asList("init","ping","settings","search","stat","show","record","termlist","bytarget",
\r
+ private static List<String> allCommands = new ArrayList<String>(Arrays.asList("init","ping","settings",
\r
+ "search","stat","show","record","termlist","bytarget","info",
\r
/* SP extras */ "auth","categories"));
\r
Map<String,Boolean> pendingStateChanges = new HashMap<String,Boolean>();
\r
private static Logger logger = Logger.getLogger(StateManager.class);
\r
/* SP extras */ "auth","categories"));
\r
Map<String,Boolean> pendingStateChanges = new HashMap<String,Boolean>();
\r
private static Logger logger = Logger.getLogger(StateManager.class);
\r