Project

General

Profile

« Previous | Next » 

Revision 9334

fix compilation error for previous change: include isPublic criteria when there is a public subject (which is always).

View differences:

metacat-common/src/main/java/edu/ucsb/nceas/metacat/common/query/SolrQueryService.java
178 178
                            query.append(OPENPARENTHESE+READPERMISSION+COLON+"\""+subjectName+"\""+CLOSEPARENTHESE);
179 179
                            if(!subjectName.equals(Constants.SUBJECT_PUBLIC) && !subjectName.equals(Constants.SUBJECT_AUTHENTICATED_USER)) {
180 180
                                query.append(OR+OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+subjectName+"\""+CLOSEPARENTHESE);
181
                            } else if (subjectName.equals(Constants.SUBJECT_PUBLIC) {
181
                            } else if (subjectName.equals(Constants.SUBJECT_PUBLIC)) {
182 182
                                query.append(OR+OPENPARENTHESE+IS_PUBLIC+COLON+"true"+CLOSEPARENTHESE);
183 183
                            }
184 184
                        } else {
185 185
                            query.append(OR + OPENPARENTHESE+READPERMISSION+COLON+"\""+subjectName+"\""+CLOSEPARENTHESE);
186 186
                            if(!subjectName.equals(Constants.SUBJECT_PUBLIC) && !subjectName.equals(Constants.SUBJECT_AUTHENTICATED_USER)) {
187 187
                                query.append(OR + OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+subjectName+"\""+CLOSEPARENTHESE);
188
                            } else if (subjectName.equals(Constants.SUBJECT_PUBLIC) {
188
                            } else if (subjectName.equals(Constants.SUBJECT_PUBLIC)) {
189 189
                                query.append(OR+OPENPARENTHESE+IS_PUBLIC+COLON+"true"+CLOSEPARENTHESE);
190 190
                            }
191 191
                        }

Also available in: Unified diff