expand_library() and some refactoring


git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenFindOrder/trunk@58561 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0


git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenFindOrder/trunk@58562 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0