Skip to content

Fix location field not exported correctly to office 2007 xml#1909

Merged
Siedlerchr merged 3 commits into
masterfrom
office07location
Sep 4, 2016
Merged

Fix location field not exported correctly to office 2007 xml#1909
Siedlerchr merged 3 commits into
masterfrom
office07location

Conversation

@Siedlerchr

Copy link
Copy Markdown
Member

Fix location field not exported correctly to office 2007 xml

  • Change in CHANGELOG.md described
  • Manually tested changed features in running JabRef
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)

@Siedlerchr Siedlerchr closed this Sep 2, 2016
@Siedlerchr Siedlerchr reopened this Sep 2, 2016
@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Sep 2, 2016
// WORD SPACE , SPACE WORD SPACE (zero or more) , SPACE WORD (zero or word)
// tested using http://www.regexpal.com/
//Matches both single locations like Berlin or Stroudsburg, PA, USA
private static final Pattern ADDRESS_PATTERN = Pattern.compile("\\b(\\w+)\\s?[,]?\\s?(\\w*)\\s?[,]?\\s?(\\w*)\\b");

@stefan-kolb stefan-kolb Sep 2, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should think of documenting our regexes more. See DOI.java for an example.

@stefan-kolb

Copy link
Copy Markdown
Member

Can you please add tests for this?

@Siedlerchr

Copy link
Copy Markdown
Member Author

Yeah, already planned this. Just wanted to create a first working version.

@Siedlerchr Siedlerchr mentioned this pull request Sep 2, 2016
3 tasks
* master:
  Remove teamscale findings in the database package (#1577)
  French localization: Jabref_fr: empty strings translated + removal of unused header (#1911)
Adress in xml field is now imported as location
add some javadoc
@Siedlerchr

Copy link
Copy Markdown
Member Author

Added export/import test

* <b>\b(\w+)\s?[,]?\s?(\w+)\s?[,]?\s?(\w*)\b</b> <br>
* WORD SPACE , SPACE WORD SPACE (Can be zero or more) , SPACE WORD (Can be zero or more) <br>
* Matches both single locations (only city) like Berlin and full locations like Stroudsburg, PA, USA <br>
* tested using http://www.regexpal.com/

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Link is not relevant IMHO

@stefan-kolb

Copy link
Copy Markdown
Member

LGTM 👍 Please merge.

@Siedlerchr Siedlerchr merged commit ce67502 into master Sep 4, 2016
@Siedlerchr Siedlerchr deleted the office07location branch September 4, 2016 16:29
tobiasdiez pushed a commit that referenced this pull request Sep 5, 2016
* Check integrity edition check

* Conflict in Jabref_fr

* Changed order Biblatex/Bibtex condition

* Create own object

* Rename variable

* Extract checker to own file

* Improved comment

* French localization: Jabref_fr: empty strings translated + removal of unused header (#1911)

* Remove teamscale findings in the database package (#1577)

* Check integrity edition check

* Changed order Biblatex/Bibtex condition

* Create own object

* Rename variable

* Mark some methods as deprecated in BibEntry and BibDatabase (#1913)

* Mark some methods as deprecated in BibEntry and BibDatabase

* Rename getResolvedFieldOrAlias

* Use flatmap

* Fix location field not exported correctly to office 2007 xml (#1909)

* Fix location field not exported to office 2007 xml
* Add some test for exporting location and address field
Address in xml field is now imported as location
add some javadoc

* Add possibility to remember password for shared databases. (#1846)

* Add possibility to remember password.
- Add checkbox to the open shared database dialog
- Add SharedDatabasePreferences
- Add password encrypting and decrypting methods
- Update localization entries
- Reorganize clearing methods for Preferences

* Change prefs node and add class comment.

* Relativate node path for password storage.

* Fix LOGGER factory.

* Improve password encryption using XOR.

- Use username as one operand
- Add new parameter to the constructor

* Extract method.

* Improve exception handling.

* Improve password encryption and decryption.

- Use CBC and padding
- Hash the key before using
- Simplify conversion

* Fix modifier. Fix conflicts.

* Extract checker to own file

* Improved comment

* Translation of shared (#1919)

* Add missing entries in german localization

* Resolved conflicts

* Some more conflicts de sv

* Expressions changed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants