Handle situation where there is a directory or Symbolic link which is a directory in the project source folder.

[precisemath]

I have reviewed and tested the changes.

To be more concise:
Before Change: If the project folder had a symbolic link pointing to a directory, then the directory would not be indexed.
After Change: The directory to which the symbolic link is pointing to will be indexed.

This fixes Issue #469.

Please let me know if any other info is required for you to merge these changes.

[tarzanek]

shouldn't we fix the accept method instead this workaround?
@trondn ?

[tarzanek]

there is a
if (file.isDirectory()) {
// always accept directories so that their files can be examined
return true;
}

• in that case that your patch is needed - this code is not properly reachable, so accept should be definitely fixed then !!!

[tarzanek]

oh ... and I guess we need a test case for this (so it won't ever happen)

[vladak]

+1

Once the test case is added, I'd like to get this into 0.12-rc3.

[precisemath]

Please could someone merge this pull request into the main code base? OpenGrok is pretty much unusable for me without this change. Thanks!

[vladak]

I think there are the following outstanding problems:

• there is no test case
• the fix should be done in the accept method (as suggested by Lubos)
• in the light of issue links are already followed by default #49 I am not actually sure what exactly is the problem - symlinked directories do get indexed for me

[tarzanek]

@precisemath - the merge failed the build, see above link
please fix this, pull requests that don't pass unit tests are hard to accept

[tarzanek]

(it's actually below link, this: https://travis-ci.org/OpenGrok/OpenGrok/builds/32809906 )

[precisemath]

Hey I am not sure why the test failed. Tried analyzing the logs but was not too successful :(. I am withdrawing the pull request until I fully understand why the unit test failed and how to fix it. Would appreciate any pointers if any.

[tarzanek]

can you add a test case for YOUR code change?
e.g. for which case it works for you, please?
(obviously if I understand your point, it'd be easier to see what's going on - also see my post on other way to fix it)

• also I'd appreciate if you can explain whether -N option to indexer works for you or not

[precisemath]

-N option to the indexer works for Symbolic links which are files. When I add the -N option and point to Symbolic links which are directories, it has no effect at all.

When I look at the failures in the build (given below). I couldn't figure out how those failures are related to my change. Would appreciate some pointers in this regard:

Tests run: 5, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 7.581 sec <<< FAILURE! - in org.opensolaris.opengrok.search.SearchTest
testSearch(org.opensolaris.opengrok.search.SearchTest) Time elapsed: 0.439 sec <<< FAILURE!
java.lang.AssertionError: Search for main~ in testdata sources expected:<8> but was:<10>
at org.junit.Assert.fail(Assert.java:88)
at org.junit.Assert.failNotEquals(Assert.java:743)
at org.junit.Assert.assertEquals(Assert.java:118)
at org.junit.Assert.assertEquals(Assert.java:555)
at org.opensolaris.opengrok.search.SearchTest.testSearch(SearchTest.java:146)

testSearch(org.opensolaris.opengrok.search.SearchEngineTest) Time elapsed: 0.286 sec <<< FAILURE!
java.lang.AssertionError: expected:<8> but was:<11>
at org.junit.Assert.fail(Assert.java:88)
at org.junit.Assert.failNotEquals(Assert.java:743)
at org.junit.Assert.assertEquals(Assert.java:118)
at org.junit.Assert.assertEquals(Assert.java:555)
at org.junit.Assert.assertEquals(Assert.java:542)
at org.opensolaris.opengrok.search.SearchEngineTest.testSearch(SearchEngineTest.java:176)

[tarzanek]

let me reopen, in a sense what you want to achieve is to get -N to accept directory symlinks too
I will keep this as a reminder for a new enhancement bug (or use one of mentioned bugs here) to get this done
I think this has to be done slightly different way, but I'd need time to recheck all the files
my comment from "commented on 12 Nov 2013 " is still valid - were you able to recheck that route?

[tarzanek]

fwiw - I checked the test and it says:
Failed tests:

SearchTest.testSearch:146 Search for main~ in testdata sources expected:8 but was: 10

SearchEngineTest.testSearch:176 expected:8 but was:11

so your code change basically breaks tests so they now find more results then they should - the Q is whether this is ok, or not

[tarzanek]

the link to travis build: https://travis-ci.org/OpenGrok/OpenGrok/builds/35792450