projects
/
mkjsf-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moves Auth response class to SP data package
[mkjsf-moved-to-github.git]
/
src
/
main
/
java
/
com
/
indexdata
/
mkjsf
/
pazpar2
/
state
/
Pazpar2State.java
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
dc2d2e1
..
ac42496
100644
(file)
--- a/
src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
+++ b/
src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
@@
-14,6
+14,9
@@
import com.indexdata.mkjsf.pazpar2.commands.SettingsCommand;
import com.indexdata.mkjsf.pazpar2.commands.ShowCommand;
\r
import com.indexdata.mkjsf.pazpar2.commands.StatCommand;
\r
import com.indexdata.mkjsf.pazpar2.commands.TermlistCommand;
\r
import com.indexdata.mkjsf.pazpar2.commands.ShowCommand;
\r
import com.indexdata.mkjsf.pazpar2.commands.StatCommand;
\r
import com.indexdata.mkjsf.pazpar2.commands.TermlistCommand;
\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;
\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.CategoriesCommand;
\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommands;
\r
\r
/**
\r
* Holds a 'pazpar2 state', understood as a full set of pazpar2 commands and
\r
\r
/**
\r
* Holds a 'pazpar2 state', understood as a full set of pazpar2 commands and
\r
@@
-36,8
+39,11
@@
public class Pazpar2State {
commands.put(Pazpar2Commands.SHOW, new ShowCommand(mgr));
\r
commands.put(Pazpar2Commands.RECORD, new RecordCommand(mgr));
\r
commands.put(Pazpar2Commands.TERMLIST, new TermlistCommand(mgr));
\r
commands.put(Pazpar2Commands.SHOW, new ShowCommand(mgr));
\r
commands.put(Pazpar2Commands.RECORD, new RecordCommand(mgr));
\r
commands.put(Pazpar2Commands.TERMLIST, new TermlistCommand(mgr));
\r
- commands.put(Pazpar2Commands.BYTARGET, new BytargetCommand(mgr));
\r
- key = "#1";
\r
+ commands.put(Pazpar2Commands.BYTARGET, new BytargetCommand(mgr));
\r
+
\r
+ commands.put(ServiceProxyCommands.AUTH, new AuthCommand(mgr));
\r
+ commands.put(ServiceProxyCommands.CATEGORIES, new CategoriesCommand(mgr));
\r
+ // key = "#1";
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-59,16
+65,19
@@
public class Pazpar2State {
* Generates a state key that can be used by the browser to pick
\r
* up this state again at a later point in time.
\r
*
\r
* Generates a state key that can be used by the browser to pick
\r
* up this state again at a later point in time.
\r
*
\r
+ * @see {@link com.indexdata.mkjsf.pazpar2.state.StateManager#setCurrentStateKey}
\r
* @return
\r
*/
\r
public String getKey() {
\r
if (key == null) {
\r
StringBuilder querystatebuilder = new StringBuilder("");
\r
for (Pazpar2Command command : commands.values()) {
\r
* @return
\r
*/
\r
public String getKey() {
\r
if (key == null) {
\r
StringBuilder querystatebuilder = new StringBuilder("");
\r
for (Pazpar2Command command : commands.values()) {
\r
- if (command.hasParameters()) {
\r
- querystatebuilder.append("||"+command.getCommandName()+"::");
\r
- querystatebuilder.append(command.getValueWithExpressions());
\r
- }
\r
+ if (! (command instanceof AuthCommand )) {
\r
+ if (command.hasParameters()) {
\r
+ querystatebuilder.append("||"+command.getCommandName()+"::");
\r
+ querystatebuilder.append(command.getValueWithExpressions());
\r
+ }
\r
+ }
\r
}
\r
key = "#"+querystatebuilder.toString();
\r
return key;
\r
}
\r
key = "#"+querystatebuilder.toString();
\r
return key;
\r